From 996a7fdb1daf26dfbb1a5795de764662f0246ffe Mon Sep 17 00:00:00 2001
From: agazzarini <a.gazzarini@gmail.com>
Date: Mon, 23 Mar 2015 07:15:14 +0100
Subject: [PATCH] [ issue #12 ] Code clean-up

---
 .../labs/solrdf/graph/DeepPagingIterator.java    | 16 ----------------
 .../labs/solrdf/graph/SolRDFDatasetGraph.java    |  3 +--
 .../update/Sparql11UpdateRdfDataLoader.java      | 13 ++-----------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/solrdf/src/main/java/org/gazzax/labs/solrdf/graph/DeepPagingIterator.java b/solrdf/src/main/java/org/gazzax/labs/solrdf/graph/DeepPagingIterator.java
index a2b3341..8bd22a0 100644
--- a/solrdf/src/main/java/org/gazzax/labs/solrdf/graph/DeepPagingIterator.java
+++ b/solrdf/src/main/java/org/gazzax/labs/solrdf/graph/DeepPagingIterator.java
@@ -77,10 +77,6 @@ public Triple next() {
 			currentState = iterateOverCurrentPage;
 			return currentState.next();
 		}
-		
-		public String toString() {
-			return "firstQueryExecution";
-		};
 	};
 
 	/**
@@ -111,10 +107,6 @@ public Triple next() {
 			currentState = iterateOverCurrentPage;
 			return currentState.next();
 		}
-		
-		public String toString() {
-			return "executeQuery";
-		};
 	};
 			
 	/**
@@ -162,10 +154,6 @@ DocIterator iterator() {
 			}
 			return iterator;	 
 		}
-		
-		public String toString() {
-			return "iterateOverCurrentPage";
-		};
 	};
 
 	/**
@@ -187,10 +175,6 @@ public boolean hasNext() {
 		public Triple next() {
 			return currentState.next();
 		}
-		
-		public String toString() {
-			return "checkForConsumptionCompleteness";
-		};
 	};
 	
 	private Iterator<Triple> currentState = firstQueryExecution;
diff --git a/solrdf/src/main/java/org/gazzax/labs/solrdf/graph/SolRDFDatasetGraph.java b/solrdf/src/main/java/org/gazzax/labs/solrdf/graph/SolRDFDatasetGraph.java
index 89eba72..da04fec 100644
--- a/solrdf/src/main/java/org/gazzax/labs/solrdf/graph/SolRDFDatasetGraph.java
+++ b/solrdf/src/main/java/org/gazzax/labs/solrdf/graph/SolRDFDatasetGraph.java
@@ -37,7 +37,7 @@ public boolean requireTripleBuild() {
 		}
 		
 		@Override
-		public void onDocSet(DocSet docSet) {
+		public void onDocSet(final DocSet docSet) {
 			// Nothing to be done here.
 		}
 		
@@ -50,7 +50,6 @@ public void afterTripleHasBeenBuilt(final Triple triple, final int docId) {
 	final SolrQueryRequest request;
 	final SolrQueryResponse response;
 	final QParser qParser;
-	
 	final GraphEventConsumer listener;
 	
 	/**
diff --git a/solrdf/src/main/java/org/gazzax/labs/solrdf/handler/update/Sparql11UpdateRdfDataLoader.java b/solrdf/src/main/java/org/gazzax/labs/solrdf/handler/update/Sparql11UpdateRdfDataLoader.java
index 3d226e1..7e1ec52 100644
--- a/solrdf/src/main/java/org/gazzax/labs/solrdf/handler/update/Sparql11UpdateRdfDataLoader.java
+++ b/solrdf/src/main/java/org/gazzax/labs/solrdf/handler/update/Sparql11UpdateRdfDataLoader.java
@@ -1,5 +1,6 @@
 package org.gazzax.labs.solrdf.handler.update;
 
+import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.util.ContentStream;
 import org.apache.solr.handler.loader.ContentStreamLoader;
 import org.apache.solr.request.SolrQueryRequest;
@@ -29,19 +30,9 @@ public void load(
 			final ContentStream stream, 
 			final UpdateRequestProcessor processor) throws Exception {
 		
-//		final StringWriter writer = new StringWriter(
-//				stream.getSize() != null 
-//					? stream.getSize().intValue() 
-//					: READ_BUFFER_DEFAULT_SIZE);
-//		
-//		IOUtils.copy(stream.getStream(), writer, "UTF-8");
-//		UpdateAction.execute(
-//				UpdateFactory.create(writer.toString()), 
-//				new SolRDFDatasetGraph(request, response));
-		
 		UpdateAction.execute(
 				UpdateFactory.create(
-						request.getParams().get("q")),
+						request.getParams().get(CommonParams.Q)),
 						new SolRDFDatasetGraph(request, response));
 		
 	}