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 2014/07/19 00:34:04 UTC
git commit: METAMODEL-38: Added JSON module to 'full' module
Repository: incubator-metamodel
Updated Branches:
refs/heads/master 42d836a4e -> c8868e96c
METAMODEL-38: Added JSON module to 'full' module
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/c8868e96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/c8868e96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/c8868e96
Branch: refs/heads/master
Commit: c8868e96c155e168a81309c91572645bb1218df2
Parents: 42d836a
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat Jul 19 00:33:04 2014 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat Jul 19 00:33:04 2014 +0200
----------------------------------------------------------------------
full/pom.xml | 5 +++++
.../java/org/apache/metamodel/DataContextFactory.java | 11 +++++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/c8868e96/full/pom.xml
----------------------------------------------------------------------
diff --git a/full/pom.xml b/full/pom.xml
index 8e408f4..73cb521 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -107,6 +107,11 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.metamodel</groupId>
+ <artifactId>MetaModel-json</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.metamodel</groupId>
<artifactId>MetaModel-salesforce</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/c8868e96/full/src/main/java/org/apache/metamodel/DataContextFactory.java
----------------------------------------------------------------------
diff --git a/full/src/main/java/org/apache/metamodel/DataContextFactory.java b/full/src/main/java/org/apache/metamodel/DataContextFactory.java
index 5fe45ff..8905bef 100644
--- a/full/src/main/java/org/apache/metamodel/DataContextFactory.java
+++ b/full/src/main/java/org/apache/metamodel/DataContextFactory.java
@@ -35,6 +35,7 @@ import org.apache.metamodel.excel.ExcelDataContext;
import org.apache.metamodel.fixedwidth.FixedWidthConfiguration;
import org.apache.metamodel.fixedwidth.FixedWidthDataContext;
import org.apache.metamodel.jdbc.JdbcDataContext;
+import org.apache.metamodel.json.JsonDataContext;
import org.apache.metamodel.mongodb.MongoDbDataContext;
import org.apache.metamodel.openoffice.OpenOfficeDataContext;
import org.apache.metamodel.salesforce.SalesforceDataContext;
@@ -137,6 +138,16 @@ public class DataContextFactory {
}
/**
+ * Creates a DataContext based on a JSON file
+ *
+ * @param file
+ * @return
+ */
+ public static DataContext createJsonDataContext(File file) {
+ return new JsonDataContext(file);
+ }
+
+ /**
* Creates a DataContext based on a CSV file
*
* @param file