You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/01/18 11:59:13 UTC
[4/5] git commit: MARMOTTA-423: plugged FreebaseFixit in the flow
MARMOTTA-423: plugged FreebaseFixit in the flow
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/9ee949a2
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9ee949a2
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9ee949a2
Branch: refs/heads/develop
Commit: 9ee949a296f6b73b299c4cc20deab16a70bc8de4
Parents: fa44a58
Author: Sergio Fernández <wi...@apache.org>
Authored: Sat Jan 18 11:05:23 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Sat Jan 18 11:05:23 2014 +0100
----------------------------------------------------------------------
.../ldclient/ldclient-provider-freebase/pom.xml | 25 +++++++++++++++++++-
.../vigsterkr/freebase/fix/FreebaseFixit.java | 2 +-
.../provider/freebase/FreebaseProvider.java | 5 ++--
.../test/freebase/TestFreebaseProvider.java | 18 --------------
parent/pom.xml | 5 ----
5 files changed, 28 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9ee949a2/libraries/ldclient/ldclient-provider-freebase/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-freebase/pom.xml b/libraries/ldclient/ldclient-provider-freebase/pom.xml
index 4ca4dd1..b1cea46 100644
--- a/libraries/ldclient/ldclient-provider-freebase/pom.xml
+++ b/libraries/ldclient/ldclient-provider-freebase/pom.xml
@@ -29,6 +29,29 @@
<name>LDClient Provider: Freebase RDF Access</name>
<description>Implements patched Linked Data access to Freebase data.</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-ext</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/ext/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.marmotta</groupId>
@@ -57,7 +80,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
+ <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9ee949a2/libraries/ldclient/ldclient-provider-freebase/src/ext/java/com/github/vigsterkr/freebase/fix/FreebaseFixit.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-freebase/src/ext/java/com/github/vigsterkr/freebase/fix/FreebaseFixit.java b/libraries/ldclient/ldclient-provider-freebase/src/ext/java/com/github/vigsterkr/freebase/fix/FreebaseFixit.java
index 0b97154..2c83254 100644
--- a/libraries/ldclient/ldclient-provider-freebase/src/ext/java/com/github/vigsterkr/freebase/fix/FreebaseFixit.java
+++ b/libraries/ldclient/ldclient-provider-freebase/src/ext/java/com/github/vigsterkr/freebase/fix/FreebaseFixit.java
@@ -27,7 +27,7 @@
either expressed or implied, of the FreeBSD Project.
*/
-package java.com.github.vigsterkr.freebase.fix;
+package com.github.vigsterkr.freebase.fix;
import java.io.BufferedReader;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9ee949a2/libraries/ldclient/ldclient-provider-freebase/src/main/java/org/apache/marmotta/ldclient/provider/freebase/FreebaseProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-freebase/src/main/java/org/apache/marmotta/ldclient/provider/freebase/FreebaseProvider.java b/libraries/ldclient/ldclient-provider-freebase/src/main/java/org/apache/marmotta/ldclient/provider/freebase/FreebaseProvider.java
index 423ac53..ed9e9ee 100644
--- a/libraries/ldclient/ldclient-provider-freebase/src/main/java/org/apache/marmotta/ldclient/provider/freebase/FreebaseProvider.java
+++ b/libraries/ldclient/ldclient-provider-freebase/src/main/java/org/apache/marmotta/ldclient/provider/freebase/FreebaseProvider.java
@@ -32,6 +32,7 @@ import org.openrdf.rio.RDFFormat;
import org.openrdf.rio.RDFParseException;
import org.openrdf.rio.Rio;
+import com.github.vigsterkr.freebase.fix.FreebaseFixit;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -133,8 +134,8 @@ public class FreebaseProvider extends AbstractHttpProvider {
StringWriter writer = new StringWriter();
IOUtils.copy(in, writer, encoding);
String raw = writer.toString();
- //TODO: perform fixes
- return new ByteArrayInputStream(raw.getBytes(encoding));
+ String fixed = FreebaseFixit.fixObject(raw);
+ return new ByteArrayInputStream(fixed.getBytes(encoding));
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9ee949a2/libraries/ldclient/ldclient-provider-freebase/src/test/java/org/apache/marmotta/ldclient/test/freebase/TestFreebaseProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-freebase/src/test/java/org/apache/marmotta/ldclient/test/freebase/TestFreebaseProvider.java b/libraries/ldclient/ldclient-provider-freebase/src/test/java/org/apache/marmotta/ldclient/test/freebase/TestFreebaseProvider.java
index 253e1b3..9a339c7 100644
--- a/libraries/ldclient/ldclient-provider-freebase/src/test/java/org/apache/marmotta/ldclient/test/freebase/TestFreebaseProvider.java
+++ b/libraries/ldclient/ldclient-provider-freebase/src/test/java/org/apache/marmotta/ldclient/test/freebase/TestFreebaseProvider.java
@@ -17,26 +17,11 @@
*/
package org.apache.marmotta.ldclient.test.freebase;
-import org.apache.commons.io.IOUtils;
-import org.apache.marmotta.commons.sesame.model.ModelCommons;
-import org.apache.marmotta.ldclient.exception.DataRetrievalException;
-import org.apache.marmotta.ldclient.model.ClientResponse;
import org.apache.marmotta.ldclient.test.provider.ProviderTestBase;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Ignore;
import org.junit.Test;
-import org.openrdf.query.BooleanQuery;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.Rio;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.InputStream;
-import java.io.StringWriter;
-
/**
* Test if the FreebaseProvider is working properly.
*
@@ -58,7 +43,6 @@ public class TestFreebaseProvider extends ProviderTestBase {
*
*/
@Test
- @Ignore
public void testASF() throws Exception {
testResource(ASF, "m.0nzm.sparql");
}
@@ -70,7 +54,6 @@ public class TestFreebaseProvider extends ProviderTestBase {
*
*/
@Test
- @Ignore
public void testMarmotta() throws Exception {
testResource(MARMOTTA, "m.0wqhskn.sparql");
}
@@ -82,7 +65,6 @@ public class TestFreebaseProvider extends ProviderTestBase {
*
*/
@Test
- @Ignore
public void testSergio() throws Exception {
testResource(SERGIO, "m.07zqbwz.sparql");
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9ee949a2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e4ed831..fc9c6c3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -577,11 +577,6 @@
<version>2.4</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.10</version>