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/08/12 17:26:50 UTC
[01/13] metamodel git commit: METAMODEL-1151: Added
DataContextFactory for Cassandra
Repository: metamodel
Updated Branches:
refs/heads/master 57e48be23 -> 37d72a8f9
METAMODEL-1151: Added DataContextFactory for Cassandra
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/f64a3726
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/f64a3726
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/f64a3726
Branch: refs/heads/master
Commit: f64a3726dfb5d3d1af1d63b1381f8a36254c0da8
Parents: 2fe6a2b
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat Aug 5 22:41:58 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat Aug 5 22:41:58 2017 -0700
----------------------------------------------------------------------
.../cassandra/CassandraDataContextFactory.java | 75 ++++++++++++++++++++
....apache.metamodel.factory.DataContextFactory | 1 +
2 files changed, 76 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/f64a3726/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java
----------------------------------------------------------------------
diff --git a/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java b/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java
new file mode 100644
index 0000000..482c912
--- /dev/null
+++ b/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java
@@ -0,0 +1,75 @@
+/**
+ * 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.
+ */
+package org.apache.metamodel.cassandra;
+
+import java.util.Map;
+
+import org.apache.metamodel.ConnectionException;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.factory.DataContextFactory;
+import org.apache.metamodel.factory.DataContextProperties;
+import org.apache.metamodel.factory.ResourceFactoryRegistry;
+import org.apache.metamodel.factory.UnsupportedDataContextPropertiesException;
+
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.Cluster.Builder;
+import com.google.common.base.Objects;
+import com.google.common.base.Strings;
+
+public class CassandraDataContextFactory implements DataContextFactory {
+
+ public static final String PROPERTY_TYPE = "cassandra";
+
+ @Override
+ public boolean accepts(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
+ return PROPERTY_TYPE.equals(properties.getDataContextType());
+ }
+
+ @Override
+ public DataContext create(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry)
+ throws UnsupportedDataContextPropertiesException, ConnectionException {
+
+ final Map<String, Object> map = properties.toMap();
+ final Builder clusterBuilder = Cluster.builder();
+
+ final String hostname = properties.getHostname();
+ if (!Strings.isNullOrEmpty(hostname)) {
+ clusterBuilder.addContactPoints(hostname.split(","));
+ }
+
+ if (properties.getPort() != null) {
+ clusterBuilder.withPort(properties.getPort());
+ }
+
+ if (map.containsKey("cluster-name")) {
+ clusterBuilder.withClusterName((String) map.get("cluster-name"));
+ }
+
+ if (properties.getUsername() != null && properties.getPassword() != null) {
+ clusterBuilder.withCredentials(properties.getUsername(), properties.getPassword());
+ }
+
+ final Cluster cluster = clusterBuilder.build();
+
+ final String keySpace = Objects.firstNonNull((String) map.get("keyspace"), properties.getDatabaseName());
+
+ return new CassandraDataContext(cluster, keySpace, properties.getTableDefs());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/f64a3726/cassandra/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
----------------------------------------------------------------------
diff --git a/cassandra/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory b/cassandra/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
new file mode 100644
index 0000000..270957f
--- /dev/null
+++ b/cassandra/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
@@ -0,0 +1 @@
+org.apache.metamodel.cassandra.CassandraDataContextFactory
\ No newline at end of file
[10/13] metamodel git commit: METAMODEL-1151: Added
DataContextFactory for JSON files
Posted by ka...@apache.org.
METAMODEL-1151: Added DataContextFactory for JSON files
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/7b1edb9e
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/7b1edb9e
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/7b1edb9e
Branch: refs/heads/master
Commit: 7b1edb9e170abe8f9a25e3dfbad0fd4920e2f4b8
Parents: 4ab20a3
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Aug 8 20:10:16 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Aug 8 20:10:16 2017 -0700
----------------------------------------------------------------------
....apache.metamodel.factory.DataContextFactory | 2 +-
....apache.metamodel.factory.DataContextFactory | 2 +-
.../metamodel/json/JsonDataContextFactory.java | 43 ++++++++++++++++++++
....apache.metamodel.factory.DataContextFactory | 1 +
....apache.metamodel.factory.DataContextFactory | 1 +
5 files changed, 47 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7b1edb9e/couchdb/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
----------------------------------------------------------------------
diff --git a/couchdb/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory b/couchdb/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
index cfc189f..d0575ae 100644
--- a/couchdb/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
+++ b/couchdb/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
@@ -1 +1 @@
-org.apache.metamodel.csv.CouchDbDataContextFactory
\ No newline at end of file
+org.apache.metamodel.couchdb.CouchDbDataContextFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7b1edb9e/hbase/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
----------------------------------------------------------------------
diff --git a/hbase/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory b/hbase/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
index abf20fd..26bc90f 100644
--- a/hbase/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
+++ b/hbase/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
@@ -1 +1 @@
-org.apache.metamodel.csv.HbaseDataContextFactory
\ No newline at end of file
+org.apache.metamodel.hbase.HbaseDataContextFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7b1edb9e/json/src/main/java/org/apache/metamodel/json/JsonDataContextFactory.java
----------------------------------------------------------------------
diff --git a/json/src/main/java/org/apache/metamodel/json/JsonDataContextFactory.java b/json/src/main/java/org/apache/metamodel/json/JsonDataContextFactory.java
new file mode 100644
index 0000000..bf5cd13
--- /dev/null
+++ b/json/src/main/java/org/apache/metamodel/json/JsonDataContextFactory.java
@@ -0,0 +1,43 @@
+/**
+ * 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.
+ */
+package org.apache.metamodel.json;
+
+import org.apache.metamodel.ConnectionException;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.factory.AbstractDataContextFactory;
+import org.apache.metamodel.factory.DataContextProperties;
+import org.apache.metamodel.factory.ResourceFactoryRegistry;
+import org.apache.metamodel.factory.UnsupportedDataContextPropertiesException;
+import org.apache.metamodel.util.Resource;
+
+public class JsonDataContextFactory extends AbstractDataContextFactory {
+
+ @Override
+ protected String getType() {
+ return "json";
+ }
+
+ @Override
+ public DataContext create(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry)
+ throws UnsupportedDataContextPropertiesException, ConnectionException {
+ final Resource resource = resourceFactoryRegistry.createResource(properties.getResourceProperties());
+ return new JsonDataContext(resource);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7b1edb9e/json/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
----------------------------------------------------------------------
diff --git a/json/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory b/json/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
new file mode 100644
index 0000000..938193d
--- /dev/null
+++ b/json/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
@@ -0,0 +1 @@
+org.apache.metamodel.json.JsonDataContextFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7b1edb9e/salesforce/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
----------------------------------------------------------------------
diff --git a/salesforce/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory b/salesforce/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
new file mode 100644
index 0000000..4490d36
--- /dev/null
+++ b/salesforce/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
@@ -0,0 +1 @@
+org.apache.metamodel.salesforce.SalesforceDataContextFactory
\ No newline at end of file
[12/13] metamodel git commit: METAMODEL-1151: Added test to ensure
loading of factory classes
Posted by ka...@apache.org.
METAMODEL-1151: Added test to ensure loading of factory classes
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/57a614de
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/57a614de
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/57a614de
Branch: refs/heads/master
Commit: 57a614dee43f72051c50d9b8af5b31b99cfddb78
Parents: 7b91f36
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Aug 8 20:55:43 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Aug 8 21:05:57 2017 -0700
----------------------------------------------------------------------
.../factory/AbstractDataContextFactory.java | 10 +--
.../factory/DataContextFactoryRegistryTest.java | 66 ++++++++++++++++++++
2 files changed, 71 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/57a614de/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java b/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java
index f338d3e..045eb63 100644
--- a/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java
+++ b/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java
@@ -76,18 +76,18 @@ public abstract class AbstractDataContextFactory implements DataContextFactory {
private static boolean isNullOrEmpty(Object value) {
if (value == null) {
- return false;
+ return true;
}
if (value instanceof String && ((String) value).isEmpty()) {
- return false;
+ return true;
}
if (value instanceof Collection && ((Collection<?>) value).isEmpty()) {
- return false;
+ return true;
}
if (value instanceof Map && ((Map<?, ?>) value).isEmpty()) {
- return false;
+ return true;
}
- return true;
+ return false;
}
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/57a614de/full/src/test/java/org/apache/metamodel/factory/DataContextFactoryRegistryTest.java
----------------------------------------------------------------------
diff --git a/full/src/test/java/org/apache/metamodel/factory/DataContextFactoryRegistryTest.java b/full/src/test/java/org/apache/metamodel/factory/DataContextFactoryRegistryTest.java
new file mode 100644
index 0000000..03fd40f
--- /dev/null
+++ b/full/src/test/java/org/apache/metamodel/factory/DataContextFactoryRegistryTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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.
+ */
+package org.apache.metamodel.factory;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.metamodel.cassandra.CassandraDataContextFactory;
+import org.apache.metamodel.couchdb.CouchDbDataContextFactory;
+import org.apache.metamodel.csv.CsvDataContextFactory;
+import org.apache.metamodel.elasticsearch.nativeclient.ElasticSearchDataContextFactory;
+import org.apache.metamodel.elasticsearch.rest.ElasticSearchRestDataContextFactory;
+import org.apache.metamodel.excel.ExcelDataContextFactory;
+import org.apache.metamodel.fixedwidth.FixedWidthDataContextFactory;
+import org.apache.metamodel.hbase.HbaseDataContextFactory;
+import org.apache.metamodel.jdbc.JdbcDataContextFactory;
+import org.apache.metamodel.json.JsonDataContextFactory;
+import org.apache.metamodel.pojo.PojoDataContextFactory;
+import org.apache.metamodel.salesforce.SalesforceDataContextFactory;
+import org.apache.metamodel.xml.XmlDomDataContextFactory;
+import org.apache.metamodel.xml.XmlSaxDataContextFactory;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DataContextFactoryRegistryTest {
+
+ @Test
+ public void testLoadAllFactories() {
+ final DataContextFactoryRegistry registry = DataContextFactoryRegistryImpl.getDefaultInstance();
+ final Collection<DataContextFactory> factories = registry.getFactories();
+
+ final List<Class<?>> factoryClasses = factories.stream().map(f -> f.getClass()).collect(Collectors.toList());
+
+ Assert.assertTrue(factoryClasses.contains(CassandraDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(CsvDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(CouchDbDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(ElasticSearchDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(ElasticSearchRestDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(ExcelDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(FixedWidthDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(HbaseDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(JdbcDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(JsonDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(PojoDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(SalesforceDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(XmlDomDataContextFactory.class));
+ Assert.assertTrue(factoryClasses.contains(XmlSaxDataContextFactory.class));
+ }
+}
[13/13] metamodel git commit: METAMODEL-1151: Updated CHANGES.md
Posted by ka...@apache.org.
METAMODEL-1151: Updated CHANGES.md
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/37d72a8f
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/37d72a8f
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/37d72a8f
Branch: refs/heads/master
Commit: 37d72a8f950b2fb43af92bf56b1d6b2b38955b06
Parents: 57a614d
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat Aug 12 10:26:20 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat Aug 12 10:26:20 2017 -0700
----------------------------------------------------------------------
CHANGES.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/37d72a8f/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index 8992c3d..f2f97d0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@
* [METAMODEL-1141] - Added RFC 4180 compliant CSV parsing.
* [METAMODEL-1144] - Optimized evaluation of conditional client-side JOIN statements.
* [METAMODEL-1145] - Fixed bug with modelling JDBC table relationships when there are multiple keys involved in the relationship.
+ * [METAMODEL-1151] - Added DataContextFactory classes for instantiating DataContexts of many types based on properties.
### Apache MetaModel 4.6.0
[06/13] metamodel git commit: METAMODEL-1151: Added
DataContextFactory for Salesforce
Posted by ka...@apache.org.
METAMODEL-1151: Added DataContextFactory for Salesforce
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/22b9164a
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/22b9164a
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/22b9164a
Branch: refs/heads/master
Commit: 22b9164ae7d35c26a51db70b2b62c40174813c4b
Parents: 38676da
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Aug 6 19:42:07 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Aug 6 19:42:07 2017 -0700
----------------------------------------------------------------------
.../salesforce/SalesforceDataContext.java | 30 ++++++-------
.../SalesforceDataContextFactory.java | 47 ++++++++++++++++++++
.../salesforce/SalesforceUpdateCallback.java | 30 ++++++-------
3 files changed, 75 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/22b9164a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
----------------------------------------------------------------------
diff --git a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
index 37467b7..0fc4257 100644
--- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
+++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
@@ -24,8 +24,6 @@ import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
-import com.sforce.ws.ConnectorConfig;
-
import org.apache.metamodel.MetaModelException;
import org.apache.metamodel.QueryPostprocessDataContext;
import org.apache.metamodel.UpdateScript;
@@ -50,16 +48,16 @@ import com.sforce.soap.partner.Connector;
import com.sforce.soap.partner.PartnerConnection;
import com.sforce.soap.partner.QueryResult;
import com.sforce.ws.ConnectionException;
+import com.sforce.ws.ConnectorConfig;
/**
* A datacontext that uses the Salesforce API.
*
- * Metadata about schema structure is explored using 'describe' SOAP web
- * services.
+ * Metadata about schema structure is explored using 'describe' SOAP web services.
*
- * Queries are fired using the SOQL dialect of SQL, see <a href=
- * "http://www.salesforce.com/us/developer/docs/api/Content/sforce_api_calls_soql_select.htm"
- * >SOQL reference</a>.
+ * Queries are fired using the SOQL dialect of SQL, see
+ * <a href= "http://www.salesforce.com/us/developer/docs/api/Content/sforce_api_calls_soql_select.htm" >SOQL
+ * reference</a>.
*/
public class SalesforceDataContext extends QueryPostprocessDataContext implements UpdateableDataContext {
@@ -77,11 +75,13 @@ public class SalesforceDataContext extends QueryPostprocessDataContext implement
public SalesforceDataContext(String endpoint, String username, String password, String securityToken) {
try {
- ConnectorConfig config = new ConnectorConfig();
+ final ConnectorConfig config = new ConnectorConfig();
config.setUsername(username);
config.setPassword(securityToken == null ? password : password + securityToken);
- config.setAuthEndpoint(endpoint);
- config.setServiceEndpoint(endpoint);
+ if (endpoint != null) {
+ config.setAuthEndpoint(endpoint);
+ config.setServiceEndpoint(endpoint);
+ }
_connection = Connector.newConnection(config);
} catch (ConnectionException e) {
throw SalesforceUtils.wrapException(e, "Failed to log in to Salesforce service");
@@ -90,7 +90,8 @@ public class SalesforceDataContext extends QueryPostprocessDataContext implement
public SalesforceDataContext(String username, String password, String securityToken) {
try {
- _connection = Connector.newConnection(username, securityToken == null ? password : password + securityToken);
+ _connection =
+ Connector.newConnection(username, securityToken == null ? password : password + securityToken);
} catch (ConnectionException e) {
throw SalesforceUtils.wrapException(e, "Failed to log in to Salesforce service");
}
@@ -105,11 +106,9 @@ public class SalesforceDataContext extends QueryPostprocessDataContext implement
}
/**
- * Creates a {@code SalesforceDataContext} instance , configured with given
- * salesforce connection.
+ * Creates a {@code SalesforceDataContext} instance , configured with given salesforce connection.
*
- * @param connection
- * salesforce connection (cannot be {@code null}).
+ * @param connection salesforce connection (cannot be {@code null}).
*
*/
public SalesforceDataContext(PartnerConnection connection) {
@@ -355,7 +354,6 @@ public class SalesforceDataContext extends QueryPostprocessDataContext implement
}
}
- @SuppressWarnings("deprecation")
private static void validateSoqlSupportedSelectItem(SelectItem selectItem) throws UnsupportedOperationException {
if (selectItem.hasFunction()) {
throw new UnsupportedOperationException("Function select items not supported: " + selectItem);
http://git-wip-us.apache.org/repos/asf/metamodel/blob/22b9164a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContextFactory.java
----------------------------------------------------------------------
diff --git a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContextFactory.java b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContextFactory.java
new file mode 100644
index 0000000..02093e7
--- /dev/null
+++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContextFactory.java
@@ -0,0 +1,47 @@
+/**
+ * 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.
+ */
+package org.apache.metamodel.salesforce;
+
+import org.apache.metamodel.ConnectionException;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.factory.AbstractDataContextFactory;
+import org.apache.metamodel.factory.DataContextProperties;
+import org.apache.metamodel.factory.ResourceFactoryRegistry;
+import org.apache.metamodel.factory.UnsupportedDataContextPropertiesException;
+
+public class SalesforceDataContextFactory extends AbstractDataContextFactory {
+
+ @Override
+ protected String getType() {
+ return "salesforce";
+ }
+
+ @Override
+ public DataContext create(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry)
+ throws UnsupportedDataContextPropertiesException, ConnectionException {
+
+ final String endpoint = properties.getUrl();
+ final String username = properties.getUsername();
+ final String password = properties.getPassword();
+ final String securityToken = (String) properties.toMap().get("security-token");
+
+ return new SalesforceDataContext(endpoint, username, password, securityToken);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/22b9164a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java
----------------------------------------------------------------------
diff --git a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java
index bf9b43b..b745267 100644
--- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java
+++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java
@@ -63,8 +63,8 @@ final class SalesforceUpdateCallback extends AbstractUpdateCallback implements C
}
@Override
- public TableCreationBuilder createTable(Schema schema, String name) throws IllegalArgumentException,
- IllegalStateException {
+ public TableCreationBuilder createTable(Schema schema, String name)
+ throws IllegalArgumentException, IllegalStateException {
throw new UnsupportedOperationException("Table creation not supported for Salesforce.com.");
}
@@ -79,14 +79,14 @@ final class SalesforceUpdateCallback extends AbstractUpdateCallback implements C
}
@Override
- public TableDropBuilder dropTable(Table table) throws IllegalArgumentException, IllegalStateException,
- UnsupportedOperationException {
+ public TableDropBuilder dropTable(Table table)
+ throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
throw new UnsupportedOperationException("Table dropping not supported for Salesforce.com.");
}
@Override
- public RowInsertionBuilder insertInto(Table table) throws IllegalArgumentException, IllegalStateException,
- UnsupportedOperationException {
+ public RowInsertionBuilder insertInto(Table table)
+ throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
return new SalesforceInsertBuilder(this, table);
}
@@ -96,8 +96,8 @@ final class SalesforceUpdateCallback extends AbstractUpdateCallback implements C
}
@Override
- public RowDeletionBuilder deleteFrom(Table table) throws IllegalArgumentException, IllegalStateException,
- UnsupportedOperationException {
+ public RowDeletionBuilder deleteFrom(Table table)
+ throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
return new SalesforceDeleteBuilder(this, table);
}
@@ -147,12 +147,12 @@ final class SalesforceUpdateCallback extends AbstractUpdateCallback implements C
break;
}
}
-
+
if (onlyMalformedId) {
return;
}
}
-
+
errors++;
for (com.sforce.soap.partner.Error error : errorArray) {
@@ -180,8 +180,8 @@ final class SalesforceUpdateCallback extends AbstractUpdateCallback implements C
}
@Override
- public RowUpdationBuilder update(Table table) throws IllegalArgumentException, IllegalStateException,
- UnsupportedOperationException {
+ public RowUpdationBuilder update(Table table)
+ throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
return new SalesforceUpdateBuilder(this, table);
}
@@ -208,14 +208,12 @@ final class SalesforceUpdateCallback extends AbstractUpdateCallback implements C
}
/**
- * Validates and builds a list of ID's referenced in a (potentially
- * composite) filter item. This is useful for both UPDATE and DELETE
- * operations in Salesforce, which are only supported by-id.
+ * Validates and builds a list of ID's referenced in a (potentially composite) filter item. This is useful for both
+ * UPDATE and DELETE operations in Salesforce, which are only supported by-id.
*
* @param idList
* @param whereItem
*/
- @SuppressWarnings("deprecation")
protected void buildIdList(List<String> idList, FilterItem whereItem) {
if (whereItem.isCompoundFilter()) {
final LogicalOperator logicalOperator = whereItem.getLogicalOperator();
[03/13] metamodel git commit: METAMODEL-1151: Added
DataContextFactory update for CSV
Posted by ka...@apache.org.
METAMODEL-1151: Added DataContextFactory update for CSV
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/689f9d9c
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/689f9d9c
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/689f9d9c
Branch: refs/heads/master
Commit: 689f9d9c0614e9c402640bb410c0ccb69b27329e
Parents: b4814d1
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat Aug 5 22:52:52 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat Aug 5 22:52:52 2017 -0700
----------------------------------------------------------------------
.../apache/metamodel/csv/CsvDataContextFactory.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/689f9d9c/csv/src/main/java/org/apache/metamodel/csv/CsvDataContextFactory.java
----------------------------------------------------------------------
diff --git a/csv/src/main/java/org/apache/metamodel/csv/CsvDataContextFactory.java b/csv/src/main/java/org/apache/metamodel/csv/CsvDataContextFactory.java
index 105fd5b..eeaad1b 100644
--- a/csv/src/main/java/org/apache/metamodel/csv/CsvDataContextFactory.java
+++ b/csv/src/main/java/org/apache/metamodel/csv/CsvDataContextFactory.java
@@ -22,8 +22,11 @@ import org.apache.metamodel.DataContext;
import org.apache.metamodel.factory.DataContextFactory;
import org.apache.metamodel.factory.DataContextProperties;
import org.apache.metamodel.factory.ResourceFactoryRegistry;
+import org.apache.metamodel.schema.naming.ColumnNamingStrategy;
+import org.apache.metamodel.schema.naming.CustomColumnNamingStrategy;
import org.apache.metamodel.util.FileHelper;
import org.apache.metamodel.util.Resource;
+import org.apache.metamodel.util.SimpleTableDef;
public class CsvDataContextFactory implements DataContextFactory {
@@ -49,8 +52,17 @@ public class CsvDataContextFactory implements DataContextFactory {
final boolean failOnInconsistentRowLength = getBoolean(properties.isFailOnInconsistentRowLength(), false);
final boolean multilineValuesEnabled = getBoolean(properties.isMultilineValuesEnabled(), true);
- final CsvConfiguration configuration = new CsvConfiguration(columnNameLineNumber, encoding, separatorChar,
- quoteChar, escapeChar, failOnInconsistentRowLength, multilineValuesEnabled);
+ final ColumnNamingStrategy columnNamingStrategy;
+ if (properties.getTableDefs() == null) {
+ columnNamingStrategy = null;
+ } else {
+ final SimpleTableDef firstTable = properties.getTableDefs()[0];
+ final String[] columnNames = firstTable.getColumnNames();
+ columnNamingStrategy = new CustomColumnNamingStrategy(columnNames);
+ }
+
+ final CsvConfiguration configuration = new CsvConfiguration(columnNameLineNumber, columnNamingStrategy,
+ encoding, separatorChar, quoteChar, escapeChar, failOnInconsistentRowLength, multilineValuesEnabled);
return new CsvDataContext(resource, configuration);
}
[04/13] metamodel git commit: METAMODEL-1151: Added
DataContextFactory for Fixed Width files
Posted by ka...@apache.org.
METAMODEL-1151: Added DataContextFactory for Fixed Width files
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/b38928bf
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/b38928bf
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/b38928bf
Branch: refs/heads/master
Commit: b38928bfcf90a2266ee15d6034ea638d9b2b66d4
Parents: 689f9d9
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat Aug 5 23:08:43 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat Aug 5 23:08:43 2017 -0700
----------------------------------------------------------------------
.../FixedWidthDataContextFactory.java | 103 +++++++++++++++++++
....apache.metamodel.factory.DataContextFactory | 1 +
2 files changed, 104 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/b38928bf/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContextFactory.java
----------------------------------------------------------------------
diff --git a/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContextFactory.java b/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContextFactory.java
new file mode 100644
index 0000000..384bc2a
--- /dev/null
+++ b/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContextFactory.java
@@ -0,0 +1,103 @@
+/**
+ * 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.
+ */
+package org.apache.metamodel.fixedwidth;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.factory.DataContextFactory;
+import org.apache.metamodel.factory.DataContextProperties;
+import org.apache.metamodel.factory.ResourceFactoryRegistry;
+import org.apache.metamodel.util.FileHelper;
+import org.apache.metamodel.util.Resource;
+
+/**
+ * {@link DataContextFactory} for {@link FixedWidthDataContext}s.
+ *
+ * In addition to supporting common properties to define resource path, encoding
+ * etc., this implementation expects a custom property called "columns". This
+ * property may take one of two forms:
+ *
+ * <ul>
+ * <li>A string format where column name and widths in characters are
+ * comma-separated. Example: "id,5,name,10,amount,7,account,5".</li>
+ * <li>A key/value map where keys are column names (strings) and values are
+ * column widths (numbers).</li>
+ * </ul>
+ */
+public class FixedWidthDataContextFactory implements DataContextFactory {
+
+ public static final String PROPERTY_TYPE = "fixed-width";
+
+ @Override
+ public boolean accepts(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
+ return PROPERTY_TYPE.equals(properties.getDataContextType());
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public DataContext create(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
+ assert accepts(properties, resourceFactoryRegistry);
+
+ final Resource resource = resourceFactoryRegistry.createResource(properties.getResourceProperties());
+
+ final String encoding = getString(properties.getEncoding(), FileHelper.DEFAULT_ENCODING);
+ final boolean failOnInconsistentRowLength = getBoolean(properties.isFailOnInconsistentRowLength(), false);
+
+ final List<FixedWidthColumnSpec> columnSpecs = new ArrayList<>();
+ final Object columns = properties.toMap().get("columns");
+ if (columns instanceof Map) {
+ // expect a map with column names as keys, widths as values
+ ((Map<String, Object>) columns).forEach((k, v) -> {
+ final String name = k;
+ final int width = ((Number) v).intValue();
+ columnSpecs.add(new FixedWidthColumnSpec(name, width));
+ });
+ } else if (columns instanceof String) {
+ final String[] split = ((String) columns).split(",");
+ String nextName = null;
+ for (String token : split) {
+ try {
+ final int width = Integer.parseInt(token);
+ // parsing as a number worked - it must be a column width
+ columnSpecs.add(new FixedWidthColumnSpec(nextName, width));
+ nextName = null;
+ } catch (NumberFormatException e) {
+ // parsing as a number didn't work - it must be a column
+ // name
+ nextName = token;
+ }
+ }
+ }
+
+ final FixedWidthConfiguration configuration = new FixedWidthConfiguration(encoding, columnSpecs,
+ failOnInconsistentRowLength);
+ return new FixedWidthDataContext(resource, configuration);
+ }
+
+ private String getString(String value, String ifNull) {
+ return value == null ? ifNull : value;
+ }
+
+ private boolean getBoolean(Boolean value, boolean ifNull) {
+ return value == null ? ifNull : value;
+ }
+}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/b38928bf/fixedwidth/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
----------------------------------------------------------------------
diff --git a/fixedwidth/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory b/fixedwidth/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
new file mode 100644
index 0000000..c71922f
--- /dev/null
+++ b/fixedwidth/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
@@ -0,0 +1 @@
+org.apache.metamodel.fixedwidth.FixedWidthDataContextFactory
\ No newline at end of file
[05/13] metamodel git commit: METAMODEL-1151: Introduced a reusable
AbstractDataContextFactory class
Posted by ka...@apache.org.
METAMODEL-1151: Introduced a reusable AbstractDataContextFactory class
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/38676da4
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/38676da4
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/38676da4
Branch: refs/heads/master
Commit: 38676da4f8e0566fa2d66f896f0750ad71ad3c62
Parents: b38928b
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Aug 6 19:25:06 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Aug 6 19:25:06 2017 -0700
----------------------------------------------------------------------
.../cassandra/CassandraDataContextFactory.java | 10 ++--
.../factory/AbstractDataContextFactory.java | 56 ++++++++++++++++++++
.../metamodel/csv/CsvDataContextFactory.java | 31 +++--------
.../excel/ExcelDataContextFactory.java | 26 +++------
.../FixedWidthDataContextFactory.java | 33 ++++--------
.../metamodel/jdbc/JdbcDataContextFactory.java | 14 +++--
.../metamodel/pojo/PojoDataContextFactory.java | 10 ++--
7 files changed, 95 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/38676da4/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java
----------------------------------------------------------------------
diff --git a/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java b/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java
index 482c912..f5cdd9b 100644
--- a/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java
+++ b/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.metamodel.ConnectionException;
import org.apache.metamodel.DataContext;
-import org.apache.metamodel.factory.DataContextFactory;
+import org.apache.metamodel.factory.AbstractDataContextFactory;
import org.apache.metamodel.factory.DataContextProperties;
import org.apache.metamodel.factory.ResourceFactoryRegistry;
import org.apache.metamodel.factory.UnsupportedDataContextPropertiesException;
@@ -32,13 +32,11 @@ import com.datastax.driver.core.Cluster.Builder;
import com.google.common.base.Objects;
import com.google.common.base.Strings;
-public class CassandraDataContextFactory implements DataContextFactory {
-
- public static final String PROPERTY_TYPE = "cassandra";
+public class CassandraDataContextFactory extends AbstractDataContextFactory {
@Override
- public boolean accepts(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
- return PROPERTY_TYPE.equals(properties.getDataContextType());
+ protected String getType() {
+ return "cassandra";
}
@Override
http://git-wip-us.apache.org/repos/asf/metamodel/blob/38676da4/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java b/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java
new file mode 100644
index 0000000..7ecca91
--- /dev/null
+++ b/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java
@@ -0,0 +1,56 @@
+/**
+ * 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.
+ */
+package org.apache.metamodel.factory;
+
+import org.apache.metamodel.DataContext;
+
+/**
+ * Abstract implementation of {@link DataContextFactory} with utility methods for easier subclass implementation.
+ */
+public abstract class AbstractDataContextFactory implements DataContextFactory {
+
+ /**
+ * Gets the "type" value for the {@link DataContext}s that this factory produces. By convention these are lower-case
+ * terms such as "csv" or "jdbc", and separated by dash in case it requires multiple terms, e.g. "fixed-width".
+ *
+ * @return
+ */
+ protected abstract String getType();
+
+ @Override
+ public final boolean accepts(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
+ return getType().equals(properties.getDataContextType());
+ }
+
+ protected String getString(String value, String ifNull) {
+ return value == null ? ifNull : value;
+ }
+
+ protected int getInt(Integer value, int ifNull) {
+ return value == null ? ifNull : value;
+ }
+
+ protected boolean getBoolean(Boolean value, boolean ifNull) {
+ return value == null ? ifNull : value;
+ }
+
+ protected char getChar(Character value, char ifNull) {
+ return value == null ? ifNull : value;
+ }
+}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/38676da4/csv/src/main/java/org/apache/metamodel/csv/CsvDataContextFactory.java
----------------------------------------------------------------------
diff --git a/csv/src/main/java/org/apache/metamodel/csv/CsvDataContextFactory.java b/csv/src/main/java/org/apache/metamodel/csv/CsvDataContextFactory.java
index eeaad1b..8f1afb0 100644
--- a/csv/src/main/java/org/apache/metamodel/csv/CsvDataContextFactory.java
+++ b/csv/src/main/java/org/apache/metamodel/csv/CsvDataContextFactory.java
@@ -19,7 +19,7 @@
package org.apache.metamodel.csv;
import org.apache.metamodel.DataContext;
-import org.apache.metamodel.factory.DataContextFactory;
+import org.apache.metamodel.factory.AbstractDataContextFactory;
import org.apache.metamodel.factory.DataContextProperties;
import org.apache.metamodel.factory.ResourceFactoryRegistry;
import org.apache.metamodel.schema.naming.ColumnNamingStrategy;
@@ -28,13 +28,11 @@ import org.apache.metamodel.util.FileHelper;
import org.apache.metamodel.util.Resource;
import org.apache.metamodel.util.SimpleTableDef;
-public class CsvDataContextFactory implements DataContextFactory {
-
- public static final String PROPERTY_TYPE = "csv";
+public class CsvDataContextFactory extends AbstractDataContextFactory {
@Override
- public boolean accepts(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
- return PROPERTY_TYPE.equals(properties.getDataContextType());
+ protected String getType() {
+ return "csv";
}
@Override
@@ -43,8 +41,8 @@ public class CsvDataContextFactory implements DataContextFactory {
final Resource resource = resourceFactoryRegistry.createResource(properties.getResourceProperties());
- final int columnNameLineNumber = getInt(properties.getColumnNameLineNumber(),
- CsvConfiguration.DEFAULT_COLUMN_NAME_LINE);
+ final int columnNameLineNumber =
+ getInt(properties.getColumnNameLineNumber(), CsvConfiguration.DEFAULT_COLUMN_NAME_LINE);
final String encoding = getString(properties.getEncoding(), FileHelper.DEFAULT_ENCODING);
final char separatorChar = getChar(properties.getSeparatorChar(), CsvConfiguration.DEFAULT_SEPARATOR_CHAR);
final char quoteChar = getChar(properties.getQuoteChar(), CsvConfiguration.DEFAULT_QUOTE_CHAR);
@@ -65,21 +63,4 @@ public class CsvDataContextFactory implements DataContextFactory {
encoding, separatorChar, quoteChar, escapeChar, failOnInconsistentRowLength, multilineValuesEnabled);
return new CsvDataContext(resource, configuration);
}
-
- private String getString(String value, String ifNull) {
- return value == null ? ifNull : value;
- }
-
- private int getInt(Integer value, int ifNull) {
- return value == null ? ifNull : value;
- }
-
- private boolean getBoolean(Boolean value, boolean ifNull) {
- return value == null ? ifNull : value;
- }
-
- private char getChar(Character value, char ifNull) {
- return value == null ? ifNull : value;
- }
-
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/38676da4/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContextFactory.java
----------------------------------------------------------------------
diff --git a/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContextFactory.java b/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContextFactory.java
index 3002b8d..635be63 100644
--- a/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContextFactory.java
+++ b/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContextFactory.java
@@ -20,7 +20,7 @@ package org.apache.metamodel.excel;
import org.apache.metamodel.ConnectionException;
import org.apache.metamodel.DataContext;
-import org.apache.metamodel.factory.DataContextFactory;
+import org.apache.metamodel.factory.AbstractDataContextFactory;
import org.apache.metamodel.factory.DataContextProperties;
import org.apache.metamodel.factory.ResourceFactoryRegistry;
import org.apache.metamodel.factory.UnsupportedDataContextPropertiesException;
@@ -29,13 +29,11 @@ import org.apache.metamodel.schema.naming.CustomColumnNamingStrategy;
import org.apache.metamodel.util.Resource;
import org.apache.metamodel.util.SimpleTableDef;
-public class ExcelDataContextFactory implements DataContextFactory {
-
- public static final String PROPERTY_TYPE = "excel";
+public class ExcelDataContextFactory extends AbstractDataContextFactory {
@Override
- public boolean accepts(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
- return PROPERTY_TYPE.equals(properties.getDataContextType());
+ protected String getType() {
+ return "excel";
}
@Override
@@ -44,8 +42,8 @@ public class ExcelDataContextFactory implements DataContextFactory {
final Resource resource = resourceFactoryRegistry.createResource(properties.getResourceProperties());
- final int columnNameLineNumber = getInt(properties.getColumnNameLineNumber(),
- ExcelConfiguration.DEFAULT_COLUMN_NAME_LINE);
+ final int columnNameLineNumber =
+ getInt(properties.getColumnNameLineNumber(), ExcelConfiguration.DEFAULT_COLUMN_NAME_LINE);
final Boolean skipEmptyLines = getBoolean(properties.isSkipEmptyLines(), true);
final Boolean skipEmptyColumns = getBoolean(properties.isSkipEmptyColumns(), false);
@@ -58,16 +56,8 @@ public class ExcelDataContextFactory implements DataContextFactory {
columnNamingStrategy = new CustomColumnNamingStrategy(columnNames);
}
- final ExcelConfiguration configuration = new ExcelConfiguration(columnNameLineNumber, columnNamingStrategy,
- skipEmptyLines, skipEmptyColumns);
+ final ExcelConfiguration configuration =
+ new ExcelConfiguration(columnNameLineNumber, columnNamingStrategy, skipEmptyLines, skipEmptyColumns);
return new ExcelDataContext(resource, configuration);
}
-
- private int getInt(Integer value, int ifNull) {
- return value == null ? ifNull : value;
- }
-
- private boolean getBoolean(Boolean value, boolean ifNull) {
- return value == null ? ifNull : value;
- }
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/38676da4/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContextFactory.java
----------------------------------------------------------------------
diff --git a/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContextFactory.java b/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContextFactory.java
index 384bc2a..f20555c 100644
--- a/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContextFactory.java
+++ b/fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContextFactory.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.metamodel.DataContext;
+import org.apache.metamodel.factory.AbstractDataContextFactory;
import org.apache.metamodel.factory.DataContextFactory;
import org.apache.metamodel.factory.DataContextProperties;
import org.apache.metamodel.factory.ResourceFactoryRegistry;
@@ -32,24 +33,20 @@ import org.apache.metamodel.util.Resource;
/**
* {@link DataContextFactory} for {@link FixedWidthDataContext}s.
*
- * In addition to supporting common properties to define resource path, encoding
- * etc., this implementation expects a custom property called "columns". This
- * property may take one of two forms:
+ * In addition to supporting common properties to define resource path, encoding etc., this implementation expects a
+ * custom property called "columns". This property may take one of two forms:
*
* <ul>
- * <li>A string format where column name and widths in characters are
- * comma-separated. Example: "id,5,name,10,amount,7,account,5".</li>
- * <li>A key/value map where keys are column names (strings) and values are
- * column widths (numbers).</li>
+ * <li>A string format where column name and widths in characters are comma-separated. Example:
+ * "id,5,name,10,amount,7,account,5".</li>
+ * <li>A key/value map where keys are column names (strings) and values are column widths (numbers).</li>
* </ul>
*/
-public class FixedWidthDataContextFactory implements DataContextFactory {
-
- public static final String PROPERTY_TYPE = "fixed-width";
+public class FixedWidthDataContextFactory extends AbstractDataContextFactory {
@Override
- public boolean accepts(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
- return PROPERTY_TYPE.equals(properties.getDataContextType());
+ protected String getType() {
+ return "fixed-width";
}
@SuppressWarnings("unchecked")
@@ -88,16 +85,8 @@ public class FixedWidthDataContextFactory implements DataContextFactory {
}
}
- final FixedWidthConfiguration configuration = new FixedWidthConfiguration(encoding, columnSpecs,
- failOnInconsistentRowLength);
+ final FixedWidthConfiguration configuration =
+ new FixedWidthConfiguration(encoding, columnSpecs, failOnInconsistentRowLength);
return new FixedWidthDataContext(resource, configuration);
}
-
- private String getString(String value, String ifNull) {
- return value == null ? ifNull : value;
- }
-
- private boolean getBoolean(Boolean value, boolean ifNull) {
- return value == null ? ifNull : value;
- }
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/38676da4/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContextFactory.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContextFactory.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContextFactory.java
index 2dfe81d..6b00721 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContextFactory.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContextFactory.java
@@ -26,22 +26,20 @@ import javax.sql.DataSource;
import org.apache.metamodel.ConnectionException;
import org.apache.metamodel.DataContext;
-import org.apache.metamodel.factory.DataContextFactory;
+import org.apache.metamodel.factory.AbstractDataContextFactory;
import org.apache.metamodel.factory.DataContextProperties;
import org.apache.metamodel.factory.ResourceFactoryRegistry;
import org.apache.metamodel.schema.TableType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class JdbcDataContextFactory implements DataContextFactory {
+public class JdbcDataContextFactory extends AbstractDataContextFactory {
private static final Logger logger = LoggerFactory.getLogger(JdbcDataContextFactory.class);
- public static final String PROPERTY_TYPE = "jdbc";
-
@Override
- public boolean accepts(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
- return PROPERTY_TYPE.equals(properties.getDataContextType());
+ protected String getType() {
+ return "jdbc";
}
@Override
@@ -56,8 +54,8 @@ public class JdbcDataContextFactory implements DataContextFactory {
}
}
- final TableType[] tableTypes = properties.getTableTypes() == null ? TableType.DEFAULT_TABLE_TYPES
- : properties.getTableTypes();
+ final TableType[] tableTypes =
+ properties.getTableTypes() == null ? TableType.DEFAULT_TABLE_TYPES : properties.getTableTypes();
final String catalogName = properties.getCatalogName();
final DataSource dataSource = properties.getDataSource();
http://git-wip-us.apache.org/repos/asf/metamodel/blob/38676da4/pojo/src/main/java/org/apache/metamodel/pojo/PojoDataContextFactory.java
----------------------------------------------------------------------
diff --git a/pojo/src/main/java/org/apache/metamodel/pojo/PojoDataContextFactory.java b/pojo/src/main/java/org/apache/metamodel/pojo/PojoDataContextFactory.java
index 35842bf..b985a5b 100644
--- a/pojo/src/main/java/org/apache/metamodel/pojo/PojoDataContextFactory.java
+++ b/pojo/src/main/java/org/apache/metamodel/pojo/PojoDataContextFactory.java
@@ -23,19 +23,17 @@ import java.util.List;
import org.apache.metamodel.ConnectionException;
import org.apache.metamodel.DataContext;
-import org.apache.metamodel.factory.DataContextFactory;
+import org.apache.metamodel.factory.AbstractDataContextFactory;
import org.apache.metamodel.factory.DataContextProperties;
import org.apache.metamodel.factory.ResourceFactoryRegistry;
import org.apache.metamodel.factory.UnsupportedDataContextPropertiesException;
import org.apache.metamodel.util.SimpleTableDef;
-public class PojoDataContextFactory implements DataContextFactory {
-
- public static final String PROPERTY_TYPE = "pojo";
+public class PojoDataContextFactory extends AbstractDataContextFactory {
@Override
- public boolean accepts(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
- return PROPERTY_TYPE.equals(properties.getDataContextType());
+ protected String getType() {
+ return "pojo";
}
@Override
[11/13] metamodel git commit: METAMODEL-1151: Added
DataContextFactories for XML files
Posted by ka...@apache.org.
METAMODEL-1151: Added DataContextFactories for XML files
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/7b91f36e
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/7b91f36e
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/7b91f36e
Branch: refs/heads/master
Commit: 7b91f36e23da09fde0f59bd1810e400f438484fd
Parents: 7b1edb9
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Aug 8 20:45:34 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Aug 8 20:45:34 2017 -0700
----------------------------------------------------------------------
.../metamodel/xml/XmlDomDataContextFactory.java | 49 +++++++
.../apache/metamodel/xml/XmlSaxDataContext.java | 18 ++-
.../metamodel/xml/XmlSaxDataContextFactory.java | 134 +++++++++++++++++++
.../apache/metamodel/xml/XmlSaxTableDef.java | 9 +-
....apache.metamodel.factory.DataContextFactory | 2 +
5 files changed, 206 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7b91f36e/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContextFactory.java
----------------------------------------------------------------------
diff --git a/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContextFactory.java b/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContextFactory.java
new file mode 100644
index 0000000..d64163e
--- /dev/null
+++ b/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContextFactory.java
@@ -0,0 +1,49 @@
+/**
+ * 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.
+ */
+package org.apache.metamodel.xml;
+
+import org.apache.metamodel.ConnectionException;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.factory.DataContextFactory;
+import org.apache.metamodel.factory.DataContextProperties;
+import org.apache.metamodel.factory.ResourceFactoryRegistry;
+import org.apache.metamodel.factory.UnsupportedDataContextPropertiesException;
+import org.apache.metamodel.util.BooleanComparator;
+import org.apache.metamodel.util.Resource;
+
+public class XmlDomDataContextFactory implements DataContextFactory {
+
+ @Override
+ public boolean accepts(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
+ return "xml".equals(properties.getDataContextType()) && !properties.toMap().containsKey("table-defs");
+ }
+
+ @Override
+ public DataContext create(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry)
+ throws UnsupportedDataContextPropertiesException, ConnectionException {
+ final Resource resource = resourceFactoryRegistry.createResource(properties.getResourceProperties());
+
+ boolean autoFlattenTables = true;
+ if (properties.toMap().get("auto-flatten-tables") != null) {
+ autoFlattenTables = BooleanComparator.toBoolean(properties.toMap().get("auto-flatten-tables"));
+ }
+
+ return new XmlDomDataContext(resource, autoFlattenTables);
+ }
+}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7b91f36e/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContext.java
----------------------------------------------------------------------
diff --git a/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContext.java b/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContext.java
index 217503c..ac0a699 100644
--- a/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContext.java
+++ b/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContext.java
@@ -20,6 +20,8 @@ package org.apache.metamodel.xml;
import java.io.File;
import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -71,8 +73,8 @@ public class XmlSaxDataContext extends QueryPostprocessDataContext {
private final Supplier<InputSource> _inputSourceRef;
private final Map<XmlSaxTableDef, Map<String, String>> _valueXpaths;
private String _schemaName;
- private XmlSaxTableDef[] _tableDefs;
-
+ private Collection<XmlSaxTableDef> _tableDefs;
+
/**
* Constructs an XML DataContext based on SAX parsing.
*
@@ -80,12 +82,12 @@ public class XmlSaxDataContext extends QueryPostprocessDataContext {
* a factory reference for the input source to read the XML from.
* The ref will be repeatedly called for each access to the file!
* @param tableDefs
- * an array of table definitions, which provide instructions as
+ * a collection of table definitions, which provide instructions as
* to the xpaths to apply to the document.
*
* @see XmlSaxTableDef
*/
- public XmlSaxDataContext(Supplier<InputSource> inputSourceRef, XmlSaxTableDef... tableDefs) {
+ public XmlSaxDataContext(Supplier<InputSource> inputSourceRef, Collection<XmlSaxTableDef> tableDefs) {
_inputSourceRef = inputSourceRef;
_tableDefs = tableDefs;
_valueXpaths = new HashMap<XmlSaxTableDef, Map<String, String>>();
@@ -100,8 +102,16 @@ public class XmlSaxDataContext extends QueryPostprocessDataContext {
}
}
}
+
+ public XmlSaxDataContext(Supplier<InputSource> inputSourceRef, XmlSaxTableDef... tableDefs) {
+ this(inputSourceRef, Arrays.asList(tableDefs));
+ }
public XmlSaxDataContext(final Resource resource, XmlSaxTableDef... tableDefs) {
+ this(resource, Arrays.asList(tableDefs));
+ }
+
+ public XmlSaxDataContext(final Resource resource, Collection<XmlSaxTableDef> tableDefs) {
this(createInputSourceRef(resource), tableDefs);
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7b91f36e/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContextFactory.java
----------------------------------------------------------------------
diff --git a/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContextFactory.java b/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContextFactory.java
new file mode 100644
index 0000000..8b2acb5
--- /dev/null
+++ b/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContextFactory.java
@@ -0,0 +1,134 @@
+/**
+ * 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.
+ */
+package org.apache.metamodel.xml;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.metamodel.ConnectionException;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.factory.DataContextFactory;
+import org.apache.metamodel.factory.DataContextProperties;
+import org.apache.metamodel.factory.ResourceFactoryRegistry;
+import org.apache.metamodel.factory.UnsupportedDataContextPropertiesException;
+import org.apache.metamodel.util.Resource;
+import org.apache.metamodel.util.SimpleTableDef;
+
+/**
+ * A {@link DataContextFactory} for XML files where a "table-defs" or "xml-sax-table-defs" element has been configured
+ * and represents the tables and their XPaths as defined by {@link XmlSaxDataContext}.
+ *
+ * If "table-defs" is specified, it will first be interpreted as a {@link SimpleTableDef} which is then mapped to a
+ * {@link XmlSaxTableDef}.
+ *
+ * Alternatively, if "xml-sax-table-defs" is specified, it may either be a List, like this (JSON representation of lists
+ * and maps):
+ *
+ * <pre>
+ * [
+ * {
+ * "row-x-path": "/path/to/entity1"
+ * "value-x-paths": [
+ * "/path/to/entity1/var1",
+ * "/path/to/entity1/var2"
+ * ]
+ * },
+ * {
+ * "row-x-path": "/path/to/model2"
+ * "value-x-paths": [
+ * "/path/to/model2/field3",
+ * "/path/to/model2/field4"
+ * ]
+ * }
+ * ]
+ * </pre>
+ *
+ * Or a key/value map, like this:
+ *
+ * <pre>
+ * {
+ * "/path/to/entity1": [
+ * "/path/to/entity1/var1",
+ * "/path/to/entity1/var2"
+ * ],
+ * "/path/to/model2": [
+ * "/path/to/model2/field3",
+ * "/path/to/model2/field4"
+ * ]
+ * }
+ * </pre>
+ */
+public class XmlSaxDataContextFactory implements DataContextFactory {
+
+ @Override
+ public boolean accepts(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
+ final boolean hasTableDefs =
+ properties.getTableDefs() != null || properties.toMap().containsKey("xml-sax-table-defs");
+ return "xml".equals(properties.getDataContextType()) && hasTableDefs;
+ }
+
+ @Override
+ public DataContext create(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry)
+ throws UnsupportedDataContextPropertiesException, ConnectionException {
+
+ final List<XmlSaxTableDef> tableDefs;
+ final SimpleTableDef[] simpleTableDefs = properties.getTableDefs();
+ if (simpleTableDefs == null) {
+ tableDefs = createTableDefFromProperties(properties.toMap().get("xml-sax-table-defs"));
+ } else {
+ tableDefs = Arrays.stream(simpleTableDefs).map(tableDef -> {
+ return new XmlSaxTableDef(tableDef.getName(), tableDef.getColumnNames());
+ }).collect(Collectors.toList());
+ }
+
+ final Resource resource = resourceFactoryRegistry.createResource(properties.getResourceProperties());
+ return new XmlSaxDataContext(resource, tableDefs);
+ }
+
+ @SuppressWarnings("unchecked")
+ private List<XmlSaxTableDef> createTableDefFromProperties(Object configuredTableDefs) {
+ final List<XmlSaxTableDef> tableDefs = new ArrayList<>();
+
+ if (configuredTableDefs instanceof List) {
+ final List<Map<String, Object>> list = (List<Map<String, Object>>) configuredTableDefs;
+ list.forEach(tableDef -> {
+ final String rowXpath = (String) tableDef.get("row-x-path");
+ final Collection<String> valueXpaths = (Collection<String>) tableDef.get("value-x-paths");
+ tableDefs.add(new XmlSaxTableDef(rowXpath, valueXpaths));
+ });
+ } else if (configuredTableDefs instanceof Map) {
+ final Map<String, Collection<String>> map = (Map<String, Collection<String>>) configuredTableDefs;
+ map.forEach((k, v) -> {
+ final String rowXpath = k;
+ final Collection<String> valueXpaths = v;
+ tableDefs.add(new XmlSaxTableDef(rowXpath, valueXpaths));
+ });
+ } else {
+ throw new IllegalArgumentException(
+ "Unsupported value type for property 'xml-sax-table-defs'. Map or List expected, but got: "
+ + configuredTableDefs);
+ }
+
+ return tableDefs;
+ }
+}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7b91f36e/xml/src/main/java/org/apache/metamodel/xml/XmlSaxTableDef.java
----------------------------------------------------------------------
diff --git a/xml/src/main/java/org/apache/metamodel/xml/XmlSaxTableDef.java b/xml/src/main/java/org/apache/metamodel/xml/XmlSaxTableDef.java
index 2a6353f..3ef14c4 100644
--- a/xml/src/main/java/org/apache/metamodel/xml/XmlSaxTableDef.java
+++ b/xml/src/main/java/org/apache/metamodel/xml/XmlSaxTableDef.java
@@ -20,6 +20,7 @@ package org.apache.metamodel.xml;
import java.io.Serializable;
import java.util.Arrays;
+import java.util.Collection;
import org.apache.metamodel.schema.Table;
@@ -103,8 +104,12 @@ public final class XmlSaxTableDef implements Serializable {
* /companies/company/employee/gender, index(/companies/company)]
*/
public XmlSaxTableDef(String rowXpath, String[] valueXpaths) {
- _rowXpath = rowXpath;
- _valueXpaths = valueXpaths;
+ _rowXpath = rowXpath;
+ _valueXpaths = valueXpaths;
+ }
+
+ public XmlSaxTableDef(String rowXpath, Collection<String> valueXpaths) {
+ this(rowXpath, valueXpaths.toArray(new String[valueXpaths.size()]));
}
public String getRowXpath() {
http://git-wip-us.apache.org/repos/asf/metamodel/blob/7b91f36e/xml/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
----------------------------------------------------------------------
diff --git a/xml/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory b/xml/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
new file mode 100644
index 0000000..560e023
--- /dev/null
+++ b/xml/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
@@ -0,0 +1,2 @@
+org.apache.metamodel.xml.XmlSaxDataContextFactory
+org.apache.metamodel.xml.XmlDomDataContextFactory
\ No newline at end of file
[08/13] metamodel git commit: Merge branch 'master' into
METAMODEL-1151-data-context-factories
Posted by ka...@apache.org.
Merge branch 'master' into METAMODEL-1151-data-context-factories
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/23c44880
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/23c44880
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/23c44880
Branch: refs/heads/master
Commit: 23c448801c7f90e1779897ba2c1a3c9309c1e76b
Parents: aac3e2b 57e48be
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Aug 6 21:44:15 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Aug 6 21:44:15 2017 -0700
----------------------------------------------------------------------
CHANGES.md | 1 +
.../cassandra/CassandraDataContext.java | 3 +-
.../metamodel/cassandra/CassandraDataSet.java | 7 +-
.../cassandra/CassandraDataContextTest.java | 2 +-
core/pom.xml | 5 +
.../apache/metamodel/AbstractDataContext.java | 49 ++++----
.../metamodel/AbstractUpdateCallback.java | 4 +-
.../apache/metamodel/CompositeDataContext.java | 12 +-
.../metamodel/CompositeQueryDelegate.java | 3 +-
.../java/org/apache/metamodel/DataContext.java | 6 +-
.../metamodel/DeleteAndInsertBuilder.java | 13 +-
.../org/apache/metamodel/MetaModelHelper.java | 55 ++++----
.../metamodel/QueryPostprocessDataContext.java | 55 ++++----
.../convert/ConvertedDataSetInterceptor.java | 9 +-
.../apache/metamodel/convert/Converters.java | 29 +++--
.../create/AbstractTableCreationBuilder.java | 18 +--
.../apache/metamodel/data/AbstractDataSet.java | 11 +-
.../org/apache/metamodel/data/AbstractRow.java | 3 +-
.../metamodel/data/AbstractRowBuilder.java | 9 +-
.../metamodel/data/CachingDataSetHeader.java | 4 -
.../java/org/apache/metamodel/data/DataSet.java | 2 +-
.../apache/metamodel/data/DataSetHeader.java | 3 +-
.../metamodel/data/DataSetTableModel.java | 9 +-
.../org/apache/metamodel/data/EmptyDataSet.java | 13 +-
.../apache/metamodel/data/InMemoryDataSet.java | 2 +-
.../java/org/apache/metamodel/data/Row.java | 3 +-
.../metamodel/data/ScalarFunctionDataSet.java | 3 +-
.../metamodel/data/SimpleDataSetHeader.java | 13 +-
.../org/apache/metamodel/data/UnionDataSet.java | 2 +-
.../insert/AbstractRowInsertionBuilder.java | 8 +-
.../intercept/InterceptableDataContext.java | 34 ++---
.../org/apache/metamodel/query/FromItem.java | 14 +--
.../java/org/apache/metamodel/query/Query.java | 14 ++-
.../query/builder/GroupedQueryBuilderImpl.java | 2 +-
.../query/builder/InitFromBuilderImpl.java | 2 +-
.../query/builder/SatisfiedFromBuilder.java | 6 +-
.../builder/SatisfiedFromBuilderCallback.java | 5 +
.../metamodel/schema/AbstractRelationship.java | 32 ++---
.../apache/metamodel/schema/AbstractSchema.java | 43 +++----
.../apache/metamodel/schema/AbstractTable.java | 123 ++++++++----------
.../metamodel/schema/CompositeSchema.java | 23 ++--
.../metamodel/schema/ImmutableRelationship.java | 30 ++---
.../metamodel/schema/ImmutableSchema.java | 10 +-
.../apache/metamodel/schema/ImmutableTable.java | 12 +-
.../metamodel/schema/MutableRelationship.java | 25 ++--
.../apache/metamodel/schema/MutableSchema.java | 7 +-
.../apache/metamodel/schema/MutableTable.java | 12 +-
.../apache/metamodel/schema/Relationship.java | 5 +-
.../org/apache/metamodel/schema/Schema.java | 10 +-
.../java/org/apache/metamodel/schema/Table.java | 32 ++---
.../metamodel/AbstractDataContextTest.java | 23 ++--
.../metamodel/CompositeDataContextTest.java | 17 ++-
.../apache/metamodel/MetaModelHelperTest.java | 61 +++++----
.../org/apache/metamodel/MetaModelTestCase.java | 14 +--
.../org/apache/metamodel/MockDataContext.java | 9 +-
.../metamodel/MockUpdateableDataContext.java | 13 +-
.../QueryPostprocessDataContextTest.java | 124 +++++++++----------
.../metamodel/convert/ConvertersTest.java | 4 +-
.../create/AbstractCreateTableBuilderTest.java | 14 +--
.../metamodel/data/DataSetTableModelTest.java | 3 +-
.../apache/metamodel/data/DefaultRowTest.java | 9 +-
.../java/org/apache/metamodel/data/RowTest.java | 17 ++-
.../apache/metamodel/data/UnionDataSetTest.java | 21 +++-
.../delete/AbstractRowDeletionCallbackTest.java | 2 +-
.../intercept/InterceptableDataContextTest.java | 29 ++---
.../apache/metamodel/query/FilterItemTest.java | 30 ++---
.../apache/metamodel/query/FromItemTest.java | 11 +-
.../org/apache/metamodel/query/QueryTest.java | 2 +-
.../apache/metamodel/query/SelectItemTest.java | 14 ++-
.../builder/GroupedQueryBuilderImplTest.java | 4 +-
.../query/builder/SyntaxExamplesTest.java | 6 +-
.../metamodel/schema/MutableTableTest.java | 19 +--
.../metamodel/schema/SchemaModelTest.java | 40 +++---
...acyDeserializationObjectInputStreamTest.java | 10 +-
.../metamodel/couchdb/CouchDbDataContext.java | 8 +-
.../metamodel/couchdb/CouchDbDataSet.java | 3 +-
.../CouchDbSimpleTableDefSchemaBuilder.java | 5 +-
.../apache/metamodel/couchdb/CouchDbUtils.java | 8 +-
.../couchdb/CouchDbDataContextTest.java | 10 +-
.../metamodel/csv/CsvCreateTableBuilder.java | 6 +-
.../apache/metamodel/csv/CsvDataContext.java | 4 +-
.../org/apache/metamodel/csv/CsvDataSet.java | 9 +-
.../org/apache/metamodel/csv/CsvSchema.java | 10 +-
.../java/org/apache/metamodel/csv/CsvTable.java | 28 +++--
.../metamodel/csv/SingleLineCsvDataSet.java | 9 +-
.../metamodel/csv/CsvBigFileMemoryTest.java | 4 +-
.../metamodel/csv/CsvDataContextTest.java | 74 ++++++-----
.../metamodel/csv/SingleLineCsvRowTest.java | 6 +-
.../InterceptionCsvIntegrationTest.java | 6 +-
.../metamodel/dynamodb/DynamoDbDataContext.java | 8 +-
.../metamodel/dynamodb/DynamoDbDataSet.java | 7 +-
.../dynamodb/DynamoDbTableCreationBuilder.java | 3 +-
.../DynamoDbDataContextIntegrationTest.java | 2 +-
.../nativeclient/ElasticSearchDataContext.java | 7 +-
.../nativeclient/ElasticSearchDataSet.java | 10 +-
.../ElasticSearchDataContextTest.java | 16 +--
.../rest/ElasticSearchRestDataContext.java | 7 +-
.../rest/JestElasticSearchDataSet.java | 25 ++--
.../rest/JestElasticSearchUpdateCallback.java | 1 -
.../rest/JestElasticSearchDataContextTest.java | 16 +--
.../rest/JestElasticSearchUtilsTest.java | 14 ++-
.../excel/DefaultSpreadsheetReaderDelegate.java | 7 +-
.../metamodel/excel/ExcelDataContext.java | 24 ++--
.../metamodel/excel/ExcelDeleteBuilder.java | 10 +-
.../excel/ExcelTableCreationBuilder.java | 4 +-
.../org/apache/metamodel/excel/ExcelUtils.java | 61 +++++----
.../excel/SpreadsheetReaderDelegate.java | 4 +-
.../org/apache/metamodel/excel/XlsDataSet.java | 5 +-
.../metamodel/excel/XlsxRowPublisherAction.java | 12 +-
.../excel/XlsxSpreadsheetReaderDelegate.java | 11 +-
.../DefaultSpreadsheetReaderDelegateTest.java | 27 ++--
.../metamodel/excel/ExcelDataContextTest.java | 82 ++++++------
.../excel/ExcelUpdateCallbackTest.java | 4 +-
.../fixedwidth/EbcdicConfiguration.java | 2 +
.../fixedwidth/FixedWidthDataContext.java | 3 +-
.../metamodel/fixedwidth/FixedWidthDataSet.java | 8 +-
.../FixedWidthConfigurationReaderTest.java | 2 +-
.../fixedwidth/FixedWidthDataContextTest.java | 26 ++--
.../metamodel/hbase/HBaseDataContext.java | 2 +-
.../apache/metamodel/hbase/HBaseDataSet.java | 7 +-
.../metamodel/hbase/HBaseDataContextTest.java | 2 +-
.../metamodel/jdbc/JdbcCreateTableBuilder.java | 15 +--
.../apache/metamodel/jdbc/JdbcDataContext.java | 29 +++--
.../metamodel/jdbc/JdbcMetadataLoader.java | 5 +-
.../org/apache/metamodel/jdbc/JdbcSchema.java | 5 +-
.../apache/metamodel/jdbc/QuerySplitter.java | 4 +-
.../org/apache/metamodel/jdbc/DerbyTest.java | 16 +--
.../apache/metamodel/jdbc/H2databaseTest.java | 40 +++---
.../org/apache/metamodel/jdbc/HsqldbTest.java | 15 +--
.../metamodel/jdbc/JdbcDataContextTest.java | 34 +++--
.../metamodel/jdbc/JdbcDeleteBuilderTest.java | 4 +-
.../metamodel/jdbc/JdbcInsertBuilderTest.java | 6 +-
.../apache/metamodel/jdbc/JdbcSchemaTest.java | 10 +-
.../metamodel/jdbc/JdbcTestTemplates.java | 2 +-
.../metamodel/jdbc/JdbcUpdateBuilderTest.java | 8 +-
.../metamodel/jdbc/QuerySplitterTest.java | 15 ++-
.../org/apache/metamodel/jdbc/SqliteTest.java | 11 +-
.../jdbc/integrationtests/DB2Test.java | 6 +-
.../jdbc/integrationtests/FirebirdTest.java | 54 ++++----
.../jdbc/integrationtests/MysqlTest.java | 18 +--
.../jdbc/integrationtests/OracleTest.java | 43 ++++---
.../jdbc/integrationtests/PostgresqlTest.java | 52 ++++----
.../SQLServerJtdsDriverTest.java | 8 +-
.../SQLServerMicrosoftDriverTest.java | 6 +-
.../apache/metamodel/json/JsonDataContext.java | 7 +-
.../metamodel/json/JsonDataContextTest.java | 16 ++-
.../mongodb/mongo2/MongoDbDataContext.java | 41 +++---
.../mongodb/mongo2/MongoDbDataSet.java | 12 +-
.../mongodb/mongo2/MongoDbDataContextTest.java | 17 ++-
.../mongodb/mongo2/MongoDbDataCopyer.java | 3 +-
.../mongodb/mongo3/MongoDbDataContext.java | 42 ++++---
.../mongodb/mongo3/MongoDbDataSet.java | 11 +-
.../mongodb/mongo3/MongoDbDataContextTest.java | 22 ++--
.../mongodb/mongo3/MongoDbDataCopyer.java | 2 +-
.../neo4j/Neo4jCypherQueryBuilder.java | 12 +-
.../metamodel/neo4j/Neo4jDataContext.java | 10 +-
.../apache/metamodel/neo4j/Neo4jDataSet.java | 4 +-
.../metamodel/neo4j/Neo4jDataContextTest.java | 11 +-
.../openoffice/OpenOfficeDataContext.java | 3 +-
.../openoffice/OpenOfficeDataContextTest.java | 6 +-
.../apache/metamodel/pojo/PojoDataContext.java | 6 +-
.../org/apache/metamodel/pojo/PojoDataSet.java | 3 +-
.../metamodel/pojo/PojoDataContextTest.java | 4 +-
.../salesforce/SalesforceDataContext.java | 17 ++-
.../metamodel/salesforce/SalesforceDataSet.java | 7 +-
.../metamodel/salesforce/SalesforceSchema.java | 6 +-
.../metamodel/salesforce/SalesforceTable.java | 11 +-
.../salesforce/SalesforceDataContextTest.java | 14 +--
.../salesforce/SalesforceDataSetTest.java | 4 +-
...CsvDefaultConfigurationFromResourceTest.java | 2 +-
...vSpecifiedConfigurationFromFilenameTest.java | 2 +-
...lSpecifiedConfigurationFromFilenameTest.java | 2 +-
.../PojoDataContextFactoryBeanDelegateTest.java | 6 +-
.../metamodel/sugarcrm/SugarCrmDataContext.java | 2 +-
.../metamodel/sugarcrm/SugarCrmDataSet.java | 14 +--
.../metamodel/sugarcrm/SugarCrmSchema.java | 5 +-
.../metamodel/sugarcrm/SugarCrmTable.java | 13 +-
.../metamodel/sugarcrm/SugarCrmXmlHelper.java | 2 +-
.../sugarcrm/SugarCrmDataContextTest.java | 31 +++--
.../apache/metamodel/xml/XmlDomDataContext.java | 47 ++++---
.../apache/metamodel/xml/XmlSaxDataContext.java | 11 +-
.../metamodel/xml/XmlDomDataContextTest.java | 53 ++++----
.../metamodel/xml/XmlSaxDataContextTest.java | 10 +-
183 files changed, 1425 insertions(+), 1374 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/23c44880/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
----------------------------------------------------------------------
diff --cc salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
index 0fc4257,7e3a73e..671693e
--- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
+++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
@@@ -19,11 -19,10 +19,8 @@@
package org.apache.metamodel.salesforce;
import java.text.SimpleDateFormat;
- import java.util.Date;
- import java.util.List;
- import java.util.Locale;
- import java.util.TimeZone;
+ import java.util.*;
-import com.sforce.ws.ConnectorConfig;
-
import org.apache.metamodel.MetaModelException;
import org.apache.metamodel.QueryPostprocessDataContext;
import org.apache.metamodel.UpdateScript;
[07/13] metamodel git commit: METAMODEL-1151: Added
DataContextFactory for CouchDB
Posted by ka...@apache.org.
METAMODEL-1151: Added DataContextFactory for CouchDB
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/aac3e2b7
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/aac3e2b7
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/aac3e2b7
Branch: refs/heads/master
Commit: aac3e2b77bd447df2a8b47a445e0b917a0fbbf60
Parents: 22b9164
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Aug 6 19:42:14 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Aug 6 19:42:14 2017 -0700
----------------------------------------------------------------------
.../couchdb/CouchDbDataContextFactory.java | 76 ++++++++++++++++++++
1 file changed, 76 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/aac3e2b7/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContextFactory.java
----------------------------------------------------------------------
diff --git a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContextFactory.java b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContextFactory.java
new file mode 100644
index 0000000..edb93d8
--- /dev/null
+++ b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContextFactory.java
@@ -0,0 +1,76 @@
+/**
+ * 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.
+ */
+package org.apache.metamodel.couchdb;
+
+import java.net.MalformedURLException;
+
+import org.apache.metamodel.ConnectionException;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.factory.AbstractDataContextFactory;
+import org.apache.metamodel.factory.DataContextProperties;
+import org.apache.metamodel.factory.ResourceFactoryRegistry;
+import org.apache.metamodel.factory.UnsupportedDataContextPropertiesException;
+import org.apache.metamodel.util.SimpleTableDef;
+import org.ektorp.http.HttpClient;
+import org.ektorp.http.StdHttpClient;
+import org.ektorp.impl.StdCouchDbInstance;
+
+public class CouchDbDataContextFactory extends AbstractDataContextFactory {
+
+ @Override
+ protected String getType() {
+ return "couchdb";
+ }
+
+ @Override
+ public DataContext create(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry)
+ throws UnsupportedDataContextPropertiesException, ConnectionException {
+ final StdHttpClient.Builder httpClientBuilder = new StdHttpClient.Builder();
+
+ final String url = properties.getUrl();
+ if (url != null && !url.isEmpty()) {
+ try {
+ httpClientBuilder.url(url);
+ } catch (MalformedURLException e) {
+ throw new IllegalArgumentException(url, e);
+ }
+ } else {
+ httpClientBuilder.host(properties.getHostname());
+ httpClientBuilder.port(getInt(properties.getPort(), CouchDbDataContext.DEFAULT_PORT));
+ httpClientBuilder.enableSSL(getBoolean((Boolean) properties.toMap().get("ssl"), false));
+ }
+
+ httpClientBuilder.username(properties.getUsername());
+ httpClientBuilder.password(properties.getPassword());
+
+ final HttpClient httpClient = httpClientBuilder.build();
+ final SimpleTableDef[] tableDefs = properties.getTableDefs();
+ if (tableDefs != null && tableDefs.length > 0) {
+ return new CouchDbDataContext(httpClient, tableDefs);
+ }
+
+ final String databaseNames = properties.getDatabaseName();
+ if (databaseNames != null && !databaseNames.isEmpty()) {
+ return new CouchDbDataContext(new StdCouchDbInstance(httpClient), databaseNames.split(","));
+ }
+
+ return new CouchDbDataContext(httpClient);
+ }
+
+}
[02/13] metamodel git commit: METAMODEL-1151: Added
DataContextFactory for Excel
Posted by ka...@apache.org.
METAMODEL-1151: Added DataContextFactory for Excel
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/b4814d1c
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/b4814d1c
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/b4814d1c
Branch: refs/heads/master
Commit: b4814d1c17a24e8d24d11cb5b91a04fc6e2ec0d4
Parents: f64a372
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat Aug 5 22:52:32 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat Aug 5 22:52:32 2017 -0700
----------------------------------------------------------------------
.../excel/ExcelDataContextFactory.java | 73 ++++++++++++++++++++
....apache.metamodel.factory.DataContextFactory | 1 +
2 files changed, 74 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/b4814d1c/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContextFactory.java
----------------------------------------------------------------------
diff --git a/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContextFactory.java b/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContextFactory.java
new file mode 100644
index 0000000..3002b8d
--- /dev/null
+++ b/excel/src/main/java/org/apache/metamodel/excel/ExcelDataContextFactory.java
@@ -0,0 +1,73 @@
+/**
+ * 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.
+ */
+package org.apache.metamodel.excel;
+
+import org.apache.metamodel.ConnectionException;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.factory.DataContextFactory;
+import org.apache.metamodel.factory.DataContextProperties;
+import org.apache.metamodel.factory.ResourceFactoryRegistry;
+import org.apache.metamodel.factory.UnsupportedDataContextPropertiesException;
+import org.apache.metamodel.schema.naming.ColumnNamingStrategy;
+import org.apache.metamodel.schema.naming.CustomColumnNamingStrategy;
+import org.apache.metamodel.util.Resource;
+import org.apache.metamodel.util.SimpleTableDef;
+
+public class ExcelDataContextFactory implements DataContextFactory {
+
+ public static final String PROPERTY_TYPE = "excel";
+
+ @Override
+ public boolean accepts(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry) {
+ return PROPERTY_TYPE.equals(properties.getDataContextType());
+ }
+
+ @Override
+ public DataContext create(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry)
+ throws UnsupportedDataContextPropertiesException, ConnectionException {
+
+ final Resource resource = resourceFactoryRegistry.createResource(properties.getResourceProperties());
+
+ final int columnNameLineNumber = getInt(properties.getColumnNameLineNumber(),
+ ExcelConfiguration.DEFAULT_COLUMN_NAME_LINE);
+ final Boolean skipEmptyLines = getBoolean(properties.isSkipEmptyLines(), true);
+ final Boolean skipEmptyColumns = getBoolean(properties.isSkipEmptyColumns(), false);
+
+ final ColumnNamingStrategy columnNamingStrategy;
+ if (properties.getTableDefs() == null) {
+ columnNamingStrategy = null;
+ } else {
+ final SimpleTableDef firstTable = properties.getTableDefs()[0];
+ final String[] columnNames = firstTable.getColumnNames();
+ columnNamingStrategy = new CustomColumnNamingStrategy(columnNames);
+ }
+
+ final ExcelConfiguration configuration = new ExcelConfiguration(columnNameLineNumber, columnNamingStrategy,
+ skipEmptyLines, skipEmptyColumns);
+ return new ExcelDataContext(resource, configuration);
+ }
+
+ private int getInt(Integer value, int ifNull) {
+ return value == null ? ifNull : value;
+ }
+
+ private boolean getBoolean(Boolean value, boolean ifNull) {
+ return value == null ? ifNull : value;
+ }
+}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/b4814d1c/excel/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
----------------------------------------------------------------------
diff --git a/excel/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory b/excel/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
new file mode 100644
index 0000000..07d7cfa
--- /dev/null
+++ b/excel/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
@@ -0,0 +1 @@
+org.apache.metamodel.excel.ExcelDataContextFactory
\ No newline at end of file
[09/13] metamodel git commit: METAMODEL-1151: Added
DataContextFactory for HBase
Posted by ka...@apache.org.
METAMODEL-1151: Added DataContextFactory for HBase
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/4ab20a35
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/4ab20a35
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/4ab20a35
Branch: refs/heads/master
Commit: 4ab20a35e9c14ab456f8a1f2b14f2ff8a11dca1a
Parents: 23c4488
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Aug 8 20:02:33 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Aug 8 20:02:33 2017 -0700
----------------------------------------------------------------------
.../cassandra/CassandraDataContextFactory.java | 3 +-
.../factory/AbstractDataContextFactory.java | 53 ++++++++++++--
.../couchdb/CouchDbDataContextFactory.java | 2 +-
....apache.metamodel.factory.DataContextFactory | 1 +
.../metamodel/hbase/HBaseConfiguration.java | 3 +-
.../hbase/HbaseDataContextFactory.java | 77 ++++++++++++++++++++
....apache.metamodel.factory.DataContextFactory | 1 +
7 files changed, 128 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/4ab20a35/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java
----------------------------------------------------------------------
diff --git a/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java b/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java
index f5cdd9b..ac74305 100644
--- a/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java
+++ b/cassandra/src/main/java/org/apache/metamodel/cassandra/CassandraDataContextFactory.java
@@ -29,7 +29,6 @@ import org.apache.metamodel.factory.UnsupportedDataContextPropertiesException;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Cluster.Builder;
-import com.google.common.base.Objects;
import com.google.common.base.Strings;
public class CassandraDataContextFactory extends AbstractDataContextFactory {
@@ -65,7 +64,7 @@ public class CassandraDataContextFactory extends AbstractDataContextFactory {
final Cluster cluster = clusterBuilder.build();
- final String keySpace = Objects.firstNonNull((String) map.get("keyspace"), properties.getDatabaseName());
+ final String keySpace = getString(map.get("keyspace"), properties.getDatabaseName());
return new CassandraDataContext(cluster, keySpace, properties.getTableDefs());
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/4ab20a35/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java b/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java
index 7ecca91..f338d3e 100644
--- a/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java
+++ b/core/src/main/java/org/apache/metamodel/factory/AbstractDataContextFactory.java
@@ -18,7 +18,12 @@
*/
package org.apache.metamodel.factory;
+import java.util.Collection;
+import java.util.Map;
+
import org.apache.metamodel.DataContext;
+import org.apache.metamodel.util.BooleanComparator;
+import org.apache.metamodel.util.NumberComparator;
/**
* Abstract implementation of {@link DataContextFactory} with utility methods for easier subclass implementation.
@@ -38,19 +43,51 @@ public abstract class AbstractDataContextFactory implements DataContextFactory {
return getType().equals(properties.getDataContextType());
}
- protected String getString(String value, String ifNull) {
- return value == null ? ifNull : value;
+ protected String getString(Object value, String ifNull) {
+ if (isNullOrEmpty(value)) {
+ return ifNull;
+ }
+ return value.toString();
+ }
+
+ protected int getInt(Object value, int ifNull) {
+ if (isNullOrEmpty(value)) {
+ return ifNull;
+ }
+ return NumberComparator.toNumber(value).intValue();
}
- protected int getInt(Integer value, int ifNull) {
- return value == null ? ifNull : value;
+ protected boolean getBoolean(Object value, boolean ifNull) {
+ if (isNullOrEmpty(value)) {
+ return ifNull;
+ }
+ return BooleanComparator.toBoolean(value).booleanValue();
}
- protected boolean getBoolean(Boolean value, boolean ifNull) {
- return value == null ? ifNull : value;
+ protected char getChar(Object value, char ifNull) {
+ if (isNullOrEmpty(value)) {
+ return ifNull;
+ }
+ if (value instanceof Character) {
+ return ((Character) value).charValue();
+ }
+ return value.toString().charAt(0);
}
- protected char getChar(Character value, char ifNull) {
- return value == null ? ifNull : value;
+ private static boolean isNullOrEmpty(Object value) {
+ if (value == null) {
+ return false;
+ }
+ if (value instanceof String && ((String) value).isEmpty()) {
+ return false;
+ }
+ if (value instanceof Collection && ((Collection<?>) value).isEmpty()) {
+ return false;
+ }
+ if (value instanceof Map && ((Map<?, ?>) value).isEmpty()) {
+ return false;
+ }
+ return true;
}
+
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/4ab20a35/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContextFactory.java
----------------------------------------------------------------------
diff --git a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContextFactory.java b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContextFactory.java
index edb93d8..81c6bc0 100644
--- a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContextFactory.java
+++ b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbDataContextFactory.java
@@ -53,7 +53,7 @@ public class CouchDbDataContextFactory extends AbstractDataContextFactory {
} else {
httpClientBuilder.host(properties.getHostname());
httpClientBuilder.port(getInt(properties.getPort(), CouchDbDataContext.DEFAULT_PORT));
- httpClientBuilder.enableSSL(getBoolean((Boolean) properties.toMap().get("ssl"), false));
+ httpClientBuilder.enableSSL(getBoolean(properties.toMap().get("ssl"), false));
}
httpClientBuilder.username(properties.getUsername());
http://git-wip-us.apache.org/repos/asf/metamodel/blob/4ab20a35/couchdb/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
----------------------------------------------------------------------
diff --git a/couchdb/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory b/couchdb/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
new file mode 100644
index 0000000..cfc189f
--- /dev/null
+++ b/couchdb/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
@@ -0,0 +1 @@
+org.apache.metamodel.csv.CouchDbDataContextFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/metamodel/blob/4ab20a35/hbase/src/main/java/org/apache/metamodel/hbase/HBaseConfiguration.java
----------------------------------------------------------------------
diff --git a/hbase/src/main/java/org/apache/metamodel/hbase/HBaseConfiguration.java b/hbase/src/main/java/org/apache/metamodel/hbase/HBaseConfiguration.java
index f2ec2ec..c9fc45e 100644
--- a/hbase/src/main/java/org/apache/metamodel/hbase/HBaseConfiguration.java
+++ b/hbase/src/main/java/org/apache/metamodel/hbase/HBaseConfiguration.java
@@ -32,6 +32,7 @@ public class HBaseConfiguration extends BaseObject implements Serializable {
private static final long serialVersionUID = 1L;
+ public static final ColumnType DEFAULT_ROW_KEY_TYPE = ColumnType.BINARY;
public static final String DEFAULT_SCHEMA_NAME = "HBase";
public static final String DEFAULT_ZOOKEEPER_HOSTNAME = "127.0.0.1";
public static final int DEFAULT_ZOOKEEPER_PORT = 2181;
@@ -56,7 +57,7 @@ public class HBaseConfiguration extends BaseObject implements Serializable {
}
public HBaseConfiguration(String zookeeperHostname, int zookeeperPort) {
- this(DEFAULT_SCHEMA_NAME, zookeeperHostname, zookeeperPort, null, ColumnType.BINARY);
+ this(DEFAULT_SCHEMA_NAME, zookeeperHostname, zookeeperPort, null, DEFAULT_ROW_KEY_TYPE);
}
public HBaseConfiguration(String zookeeperHostname, int zookeeperPort, ColumnType defaultRowKeyType) {
http://git-wip-us.apache.org/repos/asf/metamodel/blob/4ab20a35/hbase/src/main/java/org/apache/metamodel/hbase/HbaseDataContextFactory.java
----------------------------------------------------------------------
diff --git a/hbase/src/main/java/org/apache/metamodel/hbase/HbaseDataContextFactory.java b/hbase/src/main/java/org/apache/metamodel/hbase/HbaseDataContextFactory.java
new file mode 100644
index 0000000..f3c2d8a
--- /dev/null
+++ b/hbase/src/main/java/org/apache/metamodel/hbase/HbaseDataContextFactory.java
@@ -0,0 +1,77 @@
+/**
+ * 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.
+ */
+package org.apache.metamodel.hbase;
+
+import java.util.Map;
+
+import org.apache.metamodel.ConnectionException;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.factory.AbstractDataContextFactory;
+import org.apache.metamodel.factory.DataContextProperties;
+import org.apache.metamodel.factory.ResourceFactoryRegistry;
+import org.apache.metamodel.factory.UnsupportedDataContextPropertiesException;
+import org.apache.metamodel.schema.ColumnType;
+import org.apache.metamodel.schema.ColumnTypeImpl;
+import org.apache.metamodel.util.SimpleTableDef;
+
+public class HbaseDataContextFactory extends AbstractDataContextFactory {
+
+ @Override
+ protected String getType() {
+ return "hbase";
+ }
+
+ @Override
+ public DataContext create(DataContextProperties properties, ResourceFactoryRegistry resourceFactoryRegistry)
+ throws UnsupportedDataContextPropertiesException, ConnectionException {
+ final Map<String, Object> map = properties.toMap();
+
+ final String schemaName = getString(map.get("schema"),
+ getString(properties.getDatabaseName(), HBaseConfiguration.DEFAULT_SCHEMA_NAME));
+ final String zookeeperHostname =
+ getString(map.get("zookeeper-hostname"), HBaseConfiguration.DEFAULT_ZOOKEEPER_HOSTNAME);
+ final int zookeeperPort = getInt(map.get("zookeeper-port"), HBaseConfiguration.DEFAULT_ZOOKEEPER_PORT);
+ final SimpleTableDef[] tableDefinitions = properties.getTableDefs();
+
+ final ColumnType defaultRowKeyType;
+ final Object configuredDefaultRowKeyType = map.get("default-row-key-type");
+ if (configuredDefaultRowKeyType == null) {
+ defaultRowKeyType = HBaseConfiguration.DEFAULT_ROW_KEY_TYPE;
+ } else if (configuredDefaultRowKeyType instanceof ColumnType) {
+ defaultRowKeyType = (ColumnType) configuredDefaultRowKeyType;
+ } else if (configuredDefaultRowKeyType instanceof String && !((String) configuredDefaultRowKeyType).isEmpty()) {
+ defaultRowKeyType = ColumnTypeImpl.valueOf((String) configuredDefaultRowKeyType);
+ } else {
+ defaultRowKeyType = HBaseConfiguration.DEFAULT_ROW_KEY_TYPE;
+ }
+
+ final int hbaseClientRetries =
+ getInt(map.get("hbase-client-retries"), HBaseConfiguration.DEFAULT_HBASE_CLIENT_RETRIES);
+ final int zookeeperSessionTimeout =
+ getInt(map.get("zookeeper-session-timeout"), HBaseConfiguration.DEFAULT_ZOOKEEPER_SESSION_TIMEOUT);
+ final int zookeeperRecoveryRetries =
+ getInt(map.get("zookeeper-recovery-retries"), HBaseConfiguration.DEFAULT_ZOOKEEPER_RECOVERY_RETRIES);
+
+ final HBaseConfiguration configuration =
+ new HBaseConfiguration(schemaName, zookeeperHostname, zookeeperPort, tableDefinitions,
+ defaultRowKeyType, hbaseClientRetries, zookeeperSessionTimeout, zookeeperRecoveryRetries);
+ return new HBaseDataContext(configuration);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/4ab20a35/hbase/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
----------------------------------------------------------------------
diff --git a/hbase/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory b/hbase/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
new file mode 100644
index 0000000..abf20fd
--- /dev/null
+++ b/hbase/src/main/resources/META-INF/services/org.apache.metamodel.factory.DataContextFactory
@@ -0,0 +1 @@
+org.apache.metamodel.csv.HbaseDataContextFactory
\ No newline at end of file