upgraded ripple dependency from 0.7 -> 1.1

tetherless-world · Jun 23, 2014 · 417f509 · 417f509
1 parent 41e7c95
commit 417f509
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git a/server/pom.xml b/server/pom.xml
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>net.fortytwo.ripple</groupId>
             <artifactId>ripple-demo</artifactId>
-            <version>0.7</version>
+            <version>1.1</version>
         </dependency>
 
         <dependency>

diff --git a/server/src/main/java/edu/rpi/tw/sesf/facetontology/impl/ConnectedFacetImpl.java b/server/src/main/java/edu/rpi/tw/sesf/facetontology/impl/ConnectedFacetImpl.java
@@ -205,7 +205,7 @@ private void crawl() throws RippleException, UnregisteredInstanceException {
 
 	    Pattern literalPattern = Pattern.compile("\"(.*?)\"(\\^\\^<(.*?)>)?");
 
-		Collector<RippleList,RippleException> c = new Collector<>();
+		Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(source.getQueryEngine(), c);
 
 	    String uriRef = "<" + _uri + ">";

diff --git a/server/src/main/java/edu/rpi/tw/sesf/facetontology/impl/FacetCollectionImpl.java b/server/src/main/java/edu/rpi/tw/sesf/facetontology/impl/FacetCollectionImpl.java
@@ -105,7 +105,7 @@ private void query() throws UnregisteredInstanceException, RippleException {
 	private void crawl() throws RippleException, UnregisteredInstanceException {
 		RippleSource source = (RippleSource)_source;
 
-		Collector<RippleList,RippleException> c = new Collector<>();
+		Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(source.getQueryEngine(), c);
 
 	    String uriRef = "<" + _uri + ">";

diff --git a/server/src/main/java/edu/rpi/tw/sesf/facetontology/impl/FilterImpl.java b/server/src/main/java/edu/rpi/tw/sesf/facetontology/impl/FilterImpl.java
@@ -88,7 +88,7 @@ private void crawl() throws RippleException, UnregisteredInstanceException {
 
 	    Pattern literalPattern = Pattern.compile("\"(.*?)\"(\\^\\^<(.*?)>)?");
 
-		Collector<RippleList,RippleException> c = new Collector<>();
+		Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(source.getQueryEngine(), c);
 
 	    String uriRef = "<" + _uri + ">";

diff --git a/server/src/main/java/edu/rpi/tw/sesf/facetontology/impl/FirstOrderFacetImpl.java b/server/src/main/java/edu/rpi/tw/sesf/facetontology/impl/FirstOrderFacetImpl.java
@@ -179,7 +179,7 @@ private void crawl() throws RippleException, UnregisteredInstanceException {
 
 	    Pattern literalPattern = Pattern.compile("\"(.*?)\"(\\^\\^<(.*?)>)?");
 
-		Collector<RippleList,RippleException> c = new Collector<>();
+		Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(source.getQueryEngine(), c);
 
 	    String uriRef = "<" + _uri + ">";

diff --git a/server/src/main/java/edu/rpi/tw/sesf/facetontology/impl/PredicateImpl.java b/server/src/main/java/edu/rpi/tw/sesf/facetontology/impl/PredicateImpl.java
@@ -161,7 +161,7 @@ private void crawl() throws RippleException, UnregisteredInstanceException {
 
 	    Pattern literalPattern = Pattern.compile("\"(.*?)\"(\\^\\^<(.*?)>)?");
 
-		Collector<RippleList,RippleException> c = new Collector<>();
+		Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(source.getQueryEngine(), c);
 
 	    String uriRef = "<" + _uri + ">";

diff --git a/server/src/main/java/edu/rpi/tw/sesf/s2s/data/DataSourceFactory.java b/server/src/main/java/edu/rpi/tw/sesf/s2s/data/DataSourceFactory.java
@@ -89,7 +89,7 @@ public DataSource createDataSource(String uri, boolean cacheOverride) {
 	public Class<? extends DataSource> getDataSourceType(String uri, DataSource source) throws RippleException {
 		if (RippleSource.class.isAssignableFrom(source.getClass())) {
 			RippleSource rsource = (RippleSource)source;
-		    Collector<RippleList,RippleException> c = new Collector<>();
+		    Collector<RippleList> c = new Collector<>();
 		    QueryPipe p = new QueryPipe(rsource.getQueryEngine(), c);
 
 		    String uriRef = "<" + uri + ">";

diff --git a/server/src/main/java/edu/rpi/tw/sesf/s2s/data/JenaPelletSource.java b/server/src/main/java/edu/rpi/tw/sesf/s2s/data/JenaPelletSource.java
@@ -151,7 +151,7 @@ private void _crawl() throws RippleException {
 
 	    Pattern literalPattern = Pattern.compile("\"(.*?)\"(\\^\\^<(.*?)>)?");
 
-	    Collector<RippleList,RippleException> c = new Collector<>();
+	    Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(rsource.getQueryEngine(), c);
 
 	    String uriRef = "<" + _uri + ">";

diff --git a/server/src/main/java/edu/rpi/tw/sesf/s2s/data/SparqlSource.java b/server/src/main/java/edu/rpi/tw/sesf/s2s/data/SparqlSource.java
@@ -129,7 +129,7 @@ private void _crawl() throws RippleException {
 
 	    Pattern literalPattern = Pattern.compile("\"(.*?)\"(\\^\\^<(.*?)>)?");
 
-	    Collector<RippleList,RippleException> c = new Collector<>();
+	    Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(rsource.getQueryEngine(), c);
 
 	    String uriRef = "<" + _uri + ">";

diff --git a/server/src/main/java/edu/rpi/tw/sesf/s2s/impl/lod/InputFromRipple.java b/server/src/main/java/edu/rpi/tw/sesf/s2s/impl/lod/InputFromRipple.java
@@ -53,7 +53,7 @@ public String getDelimiter() {
 
 	private void _crawl() throws RippleException, InvalidLinkedDataIdentifierException {
 
-	    Collector<RippleList,RippleException> c = new Collector<>();
+	    Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(_source.getQueryEngine(), c);
 
 	    Pattern literalPattern = Pattern.compile("\"(.*?)\"(\\^\\^<(.*?)>)?");

diff --git a/server/src/main/java/edu/rpi/tw/sesf/s2s/impl/lod/InterfaceFromRipple.java b/server/src/main/java/edu/rpi/tw/sesf/s2s/impl/lod/InterfaceFromRipple.java
@@ -74,7 +74,7 @@ public int getLimit() {
 
 	private void _crawl() throws RippleException, InvalidLinkedDataIdentifierException {
 
-	    Collector<RippleList,RippleException> c = new Collector<>();
+	    Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(_source.getQueryEngine(), c);
 
 	    Pattern literalPattern = Pattern.compile("\"(.*?)\"(\\^\\^<(.*?)>)?");

diff --git a/server/src/main/java/edu/rpi/tw/sesf/s2s/impl/lod/SearchServiceFromRipple.java b/server/src/main/java/edu/rpi/tw/sesf/s2s/impl/lod/SearchServiceFromRipple.java
@@ -68,7 +68,7 @@ public String getDefaultConfigurationURL() {
 
 	private void _crawl() throws RippleException, InvalidLinkedDataIdentifierException {
 
-	    Collector<RippleList,RippleException> c = new Collector<>();
+	    Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(_source.getQueryEngine(), c);
 
 	    Pattern literalPattern = Pattern.compile("\"(.*?)\"(\\^\\^<(.*?)>)?");

diff --git a/server/src/main/java/edu/rpi/tw/sesf/s2s/impl/lod/WidgetFromRipple.java b/server/src/main/java/edu/rpi/tw/sesf/s2s/impl/lod/WidgetFromRipple.java
@@ -96,7 +96,7 @@ public Vector<String> getTypes() {
 
 	private void _crawl() throws RippleException, InvalidLinkedDataIdentifierException {
 
-	    Collector<RippleList,RippleException> c = new Collector<>();
+	    Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(_source.getQueryEngine(), c);
 
 	    Pattern literalPattern = Pattern.compile("\"(.*?)\"(\\^\\^<(.*?)>)?");

diff --git a/server/src/main/java/edu/rpi/tw/sesf/s2s/web/service/impl/FacetOntologyServiceEngine.java b/server/src/main/java/edu/rpi/tw/sesf/s2s/web/service/impl/FacetOntologyServiceEngine.java
@@ -117,7 +117,7 @@ public void runQuery(String query, Map<String, String> parameters,
 	private void _crawl() throws RippleException {
 		RippleSource source = (RippleSource)_service.getDataSource();
 
-		Collector<RippleList,RippleException> c = new Collector<>();
+		Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(source.getQueryEngine(), c);
 
 	    String uriRef = "<" + _service.getURI() + ">";

diff --git a/server/src/main/java/edu/rpi/tw/sesf/s2s/web/service/impl/OpenSearchServiceEngine.java b/server/src/main/java/edu/rpi/tw/sesf/s2s/web/service/impl/OpenSearchServiceEngine.java
@@ -102,7 +102,7 @@ private void _query() throws UnregisteredInstanceException {
 
 	private void _crawl() throws RippleException, InvalidLinkedDataIdentifierException {
 
-		Collector<RippleList,RippleException> c = new Collector<>();
+		Collector<RippleList> c = new Collector<>();
 	    QueryPipe p = new QueryPipe(((RippleSource)_service.getDataSource()).getQueryEngine(), c);
 
 	    Pattern literalPattern = Pattern.compile("\"(.*?)\"(\\^\\^<(.*?)>)?");